tdf#62475: partial handmade fixes

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

46 files changed, 14 insertions, 233 deletions

diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index 21554757602a..0662f68d8797 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -896,8 +896,6 @@ namespace
     };
 }
 
-//= registration
-
 extern "C"
 {
 
@@ -907,6 +905,6 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbtools_component_getFactory(const sal_Char*
     return cppu::component_getFactoryHelper(implName, serviceManager, registryKey, entries);
 }
 
-}   // extern "C"
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/commontools/conncleanup.cxx b/connectivity/source/commontools/conncleanup.cxx
index b5882d01475a..1decb69a5618 100644
--- a/connectivity/source/commontools/conncleanup.cxx
+++ b/connectivity/source/commontools/conncleanup.cxx
@@ -34,10 +34,6 @@ namespace dbtools
 
     static const char ACTIVE_CONNECTION_PROPERTY_NAME[] = "ActiveConnection";
 
-
-    //= OAutoConnectionDisposer
-
-
     OAutoConnectionDisposer::OAutoConnectionDisposer(const Reference< XRowSet >& _rxRowSet, const Reference< XConnection >& _rxConnection)
         :m_xRowSet( _rxRowSet )
         ,m_bRSListening( false )
diff --git a/connectivity/source/commontools/dbcharset.cxx b/connectivity/source/commontools/dbcharset.cxx
index 99a5b62d8fd4..f8267bf4d2e4 100644
--- a/connectivity/source/commontools/dbcharset.cxx
+++ b/connectivity/source/commontools/dbcharset.cxx
@@ -26,11 +26,6 @@
 namespace dbtools
 {
 
-
-
-    //= OCharsetMap
-
-
     OCharsetMap::OCharsetMap()
     {
     }
@@ -129,9 +124,6 @@ namespace dbtools
     }
 
 
-    //= CharsetIteratorDerefHelper
-
-
     CharsetIteratorDerefHelper::CharsetIteratorDerefHelper( const CharsetIteratorDerefHelper& _rSource )
         :m_eEncoding( _rSource.m_eEncoding )
         ,m_aIanaName( _rSource.m_aIanaName )
@@ -145,10 +137,6 @@ namespace dbtools
     {
     }
 
-
-    //= OCharsetMap::CharsetIterator
-
-
     OCharsetMap::CharsetIterator::CharsetIterator(const OCharsetMap* _pContainer, OCharsetMap::TextEncBag::const_iterator _aPos )
         :m_pContainer( _pContainer )
         ,m_aPos( _aPos )
diff --git a/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx
index 38f6d67815cc..fa69855f95fc 100644
--- a/connectivity/source/commontools/dbexception.cxx
+++ b/connectivity/source/commontools/dbexception.cxx
@@ -39,10 +39,6 @@ namespace dbtools
     using namespace ::comphelper;
     using namespace ::connectivity;
 
-
-//= SQLExceptionInfo - encapsulating the type info of an SQLException-derived class
-
-
 SQLExceptionInfo::SQLExceptionInfo()
     :m_eType(UNDEFINED)
 {
@@ -262,11 +258,6 @@ void SQLExceptionInfo::doThrow()
     throw RuntimeException();
 }
 
-
-//= SQLExceptionIteratorHelper
-
-
-
 SQLExceptionIteratorHelper::SQLExceptionIteratorHelper( const SQLExceptionInfo& _rChainStart )
     :m_pCurrent( NULL )
     ,m_eCurrentType( SQLExceptionInfo::UNDEFINED )
diff --git a/connectivity/source/commontools/dbmetadata.cxx b/connectivity/source/commontools/dbmetadata.cxx
index fc2f1fd74728..f5a987b51b07 100644
--- a/connectivity/source/commontools/dbmetadata.cxx
+++ b/connectivity/source/commontools/dbmetadata.cxx
@@ -72,9 +72,6 @@ namespace dbtools
 
     namespace BooleanComparisonMode = ::com::sun::star::sdb::BooleanComparisonMode;
 
-
-    //= DatabaseMetaData_Impl
-
     struct DatabaseMetaData_Impl
     {
         Reference< XConnection >        xConnection;
@@ -180,10 +177,6 @@ namespace dbtools
         }
     }
 
-
-    //= DatabaseMetaData
-
-
     DatabaseMetaData::DatabaseMetaData()
         :m_pImpl( new DatabaseMetaData_Impl )
     {
diff --git a/connectivity/source/commontools/filtermanager.cxx b/connectivity/source/commontools/filtermanager.cxx
index 0104e7ff04fa..ff1f03ec6806 100644
--- a/connectivity/source/commontools/filtermanager.cxx
+++ b/connectivity/source/commontools/filtermanager.cxx
@@ -38,10 +38,6 @@ namespace dbtools
     using namespace ::com::sun::star::beans;
     using namespace connectivity;
 
-
-    //= FilterManager
-
-
     FilterManager::FilterManager( )
         :m_aFilterComponents( FC_COMPONENT_COUNT )
         ,m_bApplyPublicFilter( true )
diff --git a/connectivity/source/commontools/formattedcolumnvalue.cxx b/connectivity/source/commontools/formattedcolumnvalue.cxx
index a164763a8114..02bebf655366 100644
--- a/connectivity/source/commontools/formattedcolumnvalue.cxx
+++ b/connectivity/source/commontools/formattedcolumnvalue.cxx
@@ -66,9 +66,6 @@ namespace dbtools
     namespace DataType = ::com::sun::star::sdbc::DataType;
     namespace NumberFormat = ::com::sun::star::util::NumberFormat;
 
-
-    //= FormattedColumnValue_Data
-
     struct FormattedColumnValue_Data
     {
         Reference< XNumberFormatter >   m_xFormatter;
@@ -211,10 +208,6 @@ namespace dbtools
         }
     }
 
-
-    //= FormattedColumnValue
-
-
     FormattedColumnValue::FormattedColumnValue( const Reference< XComponentContext >& _rxContext,
             const Reference< XRowSet >& _rxRowSet, const Reference< XPropertySet >& i_rColumn )
         :m_pData( new FormattedColumnValue_Data )
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index 84ad4e4f8bed..8459ae933c9a 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -55,10 +55,6 @@ namespace dbtools
     using namespace ::comphelper;
     using namespace ::connectivity;
 
-
-    //= ParameterManager
-
-
     ParameterManager::ParameterManager( ::osl::Mutex& _rMutex, const Reference< XComponentContext >& _rxContext )
         :m_rMutex             ( _rMutex )
         ,m_aParameterListeners( _rMutex )
@@ -1083,10 +1079,6 @@ namespace dbtools
             m_xInnerParamUpdate->clearParameters( );
     }
 
-
-    //= OParameterContinuation
-
-
     void SAL_CALL OParameterContinuation::setParameters( const Sequence< PropertyValue >& _rValues ) throw( RuntimeException, std::exception )
     {
         m_aValues = _rValues;
diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx
index 70c9564e2811..fc575550b570 100644
--- a/connectivity/source/commontools/paramwrapper.cxx
+++ b/connectivity/source/commontools/paramwrapper.cxx
@@ -62,10 +62,6 @@ namespace param
     namespace PropertyAttribute = ::com::sun::star::beans::PropertyAttribute;
     namespace DataType = ::com::sun::star::sdbc::DataType;
 
-
-    //= ParameterWrapper
-
-
     ParameterWrapper::ParameterWrapper( const Reference< XPropertySet >& _rxColumn )
         :PropertyBase( m_aBHelper )
         ,m_xDelegator( _rxColumn )
@@ -262,10 +258,6 @@ namespace param
         m_aBHelper.bDisposed = sal_True;
     }
 
-
-    //= ParameterWrapperContainer
-
-
     ParameterWrapperContainer::ParameterWrapperContainer()
         :ParameterWrapperContainer_Base( m_aMutex )
     {
diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx
index bbb0863b9a00..92786f38e230 100644
--- a/connectivity/source/commontools/predicateinput.cxx
+++ b/connectivity/source/commontools/predicateinput.cxx
@@ -73,10 +73,6 @@ namespace dbtools
         return nReturn;
     }
 
-
-    //= OPredicateInputController
-
-
     bool OPredicateInputController::getSeparatorChars( const Locale& _rLocale, sal_Unicode& _rDecSep, sal_Unicode& _rThdSep ) const
     {
         _rDecSep = '.';
diff --git a/connectivity/source/commontools/propertyids.cxx b/connectivity/source/commontools/propertyids.cxx
index 2a5322ddd0d3..7acbe464a787 100644
--- a/connectivity/source/commontools/propertyids.cxx
+++ b/connectivity/source/commontools/propertyids.cxx
@@ -84,7 +84,7 @@ namespace dbtools
                 case PROPERTY_ID_DBASEPRECISIONCHANGED:     pStr = "DbasePrecisionChanged"; break;
                 case PROPERTY_ID_ISCURRENCY:                pStr = "IsCurrency"; break;
                 case PROPERTY_ID_ISBOOKMARKABLE:            pStr = "IsBookmarkable"; break;
-                case PROPERTY_ID_HY010:                     pStr = "HY010"; break; //= error messages
+                case PROPERTY_ID_HY010:                     pStr = "HY010"; break; // error messages
                 case PROPERTY_ID_DELIMITER:                 pStr = "/"; break;
                 case PROPERTY_ID_FORMATKEY:                 pStr = "FormatKey"; break;
                 case PROPERTY_ID_LOCALE:                    pStr = "Locale"; break;
diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx
index fa5f4c034ebc..f5318f80cba2 100644
--- a/connectivity/source/commontools/sqlerror.cxx
+++ b/connectivity/source/commontools/sqlerror.cxx
@@ -53,8 +53,6 @@ namespace connectivity
     }
 
 
-    //= SQLError_Impl - declaration
-
     class SQLError_Impl
     {
     public:
@@ -95,10 +93,6 @@ namespace connectivity
         bool                                                    m_bAttemptedInit;
     };
 
-
-    //= SQLError_Impl - implementation
-
-
     SQLError_Impl::SQLError_Impl( const Reference<XComponentContext> & _rxContext )
         :m_aContext( _rxContext )
         ,m_pResources( )
@@ -282,10 +276,6 @@ namespace connectivity
         return m_pResources.get() != NULL;
     }
 
-
-    //= SQLError
-
-
     SQLError::SQLError( const Reference<XComponentContext> & _rxContext )
         :m_pImpl( new SQLError_Impl( _rxContext ) )
     {
diff --git a/connectivity/source/commontools/statementcomposer.cxx b/connectivity/source/commontools/statementcomposer.cxx
index 9838787f4fcd..5057aaf158f9 100644
--- a/connectivity/source/commontools/statementcomposer.cxx
+++ b/connectivity/source/commontools/statementcomposer.cxx
@@ -52,9 +52,6 @@ namespace dbtools
 
     namespace CommandType = ::com::sun::star::sdb::CommandType;
 
-
-    //= StatementComposer_Data
-
     struct StatementComposer_Data
     {
         const Reference< XConnection >          xConnection;
@@ -233,10 +230,6 @@ namespace dbtools
         }
     }
 
-
-    //= StatementComposer
-
-
     StatementComposer::StatementComposer( const Reference< XConnection >& _rxConnection,
         const OUString&  _rCommand, const sal_Int32 _nCommandType, const bool _bEscapeProcessing )
         :m_pData( new StatementComposer_Data( _rxConnection ) )
diff --git a/connectivity/source/commontools/warningscontainer.cxx b/connectivity/source/commontools/warningscontainer.cxx
index e17e2cb82a06..4afe81aeaef8 100644
--- a/connectivity/source/commontools/warningscontainer.cxx
+++ b/connectivity/source/commontools/warningscontainer.cxx
@@ -32,10 +32,6 @@ namespace dbtools
     using namespace ::com::sun::star::sdbc;
     using namespace ::com::sun::star::sdb;
 
-
-    //= WarningsContainer
-
-
     static void lcl_concatWarnings( Any& _rChainLeft, const Any& _rChainRight )
     {
         if ( !_rChainLeft.hasValue() )
diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx
index 6c4b8ed7ea32..149d20bb64cb 100644
--- a/connectivity/source/cpool/ZConnectionPool.cxx
+++ b/connectivity/source/cpool/ZConnectionPool.cxx
@@ -41,9 +41,6 @@ using namespace connectivity;
 
 #include <algorithm>
 
-
-//= OPoolTimer
-
 void SAL_CALL OPoolTimer::onShot()
 {
     m_pPool->invalidatePooledConnections();
@@ -51,9 +48,6 @@ void SAL_CALL OPoolTimer::onShot()
 
 static const char TIMEOUT_NODENAME[] = "Timeout";
 
-//= OConnectionPool
-
-
 OConnectionPool::OConnectionPool(const Reference< XDriver >& _xDriver,
                                  const Reference< XInterface >& _xDriverNode,
                                  const Reference< ::com::sun::star::reflection::XProxyFactory >& _rxProxyFactory)
diff --git a/connectivity/source/cpool/ZConnectionPool.hxx b/connectivity/source/cpool/ZConnectionPool.hxx
index 8f89338b8dc5..d8b3c41c0d07 100644
--- a/connectivity/source/cpool/ZConnectionPool.hxx
+++ b/connectivity/source/cpool/ZConnectionPool.hxx
@@ -56,8 +56,8 @@ namespace connectivity
     };
 
 
-    //= OConnectionPool - the one-instance service for PooledConnections
-    //= manages the active connections and the connections in the pool
+    // OConnectionPool - the one-instance service for PooledConnections
+    // manages the active connections and the connections in the pool
 
     typedef ::cppu::WeakImplHelper1< ::com::sun::star::beans::XPropertyChangeListener>  OConnectionPool_Base;
 
diff --git a/connectivity/source/cpool/ZConnectionWrapper.hxx b/connectivity/source/cpool/ZConnectionWrapper.hxx
index 29b7a04cb106..7905455cc0bb 100644
--- a/connectivity/source/cpool/ZConnectionWrapper.hxx
+++ b/connectivity/source/cpool/ZConnectionWrapper.hxx
@@ -30,8 +30,8 @@ namespace connectivity
 {
 
 
-    //= OConnectionWeakWrapper - wraps all methods to the real connection from the driver
-    //= but when disposed it doesn't dispose the real connection
+    // OConnectionWeakWrapper - wraps all methods to the real connection from the driver
+    // but when disposed it doesn't dispose the real connection
 
     typedef ::cppu::WeakComponentImplHelper1<       ::com::sun::star::sdbc::XConnection
                                             > OConnectionWeakWrapper_BASE;
diff --git a/connectivity/source/cpool/ZDriverWrapper.cxx b/connectivity/source/cpool/ZDriverWrapper.cxx
index 888382146f5b..d4defb5d8db9 100644
--- a/connectivity/source/cpool/ZDriverWrapper.cxx
+++ b/connectivity/source/cpool/ZDriverWrapper.cxx
@@ -30,10 +30,6 @@ namespace connectivity
     using namespace ::com::sun::star::sdbc;
     using namespace ::com::sun::star::beans;
 
-
-    //= ODriverWrapper
-
-
     ODriverWrapper::ODriverWrapper( Reference< XAggregation >& _rxAggregateDriver, OConnectionPool* _pPool )
         :m_pConnectionPool(_pPool)
     {
diff --git a/connectivity/source/cpool/ZDriverWrapper.hxx b/connectivity/source/cpool/ZDriverWrapper.hxx
index 01a95a0c6115..7cf98f6bd953 100644
--- a/connectivity/source/cpool/ZDriverWrapper.hxx
+++ b/connectivity/source/cpool/ZDriverWrapper.hxx
@@ -32,8 +32,6 @@ namespace connectivity
 
     class OConnectionPool;
 
-    //= ODriverWrapper
-
     typedef ::cppu::WeakImplHelper1 <   ::com::sun::star::sdbc::XDriver
                                     >   ODriverWrapper_BASE;
 
diff --git a/connectivity/source/cpool/ZPoolCollection.hxx b/connectivity/source/cpool/ZPoolCollection.hxx
index 22521c977559..94594ec5a526 100644
--- a/connectivity/source/cpool/ZPoolCollection.hxx
+++ b/connectivity/source/cpool/ZPoolCollection.hxx
@@ -44,8 +44,8 @@ namespace connectivity
 {
     class OConnectionPool;
 
-    //= OPoolCollection - the one-instance service for PooledConnections
-    //= manages the active connections and the connections in the pool
+    // OPoolCollection - the one-instance service for PooledConnections
+    // manages the active connections and the connections in the pool
 
     typedef ::cppu::WeakImplHelper4<    ::com::sun::star::sdbc::XConnectionPool,
                                         ::com::sun::star::lang::XServiceInfo,
diff --git a/connectivity/source/cpool/ZPooledConnection.hxx b/connectivity/source/cpool/ZPooledConnection.hxx
index 26dba7b32faf..92d49d956d98 100644
--- a/connectivity/source/cpool/ZPooledConnection.hxx
+++ b/connectivity/source/cpool/ZPooledConnection.hxx
@@ -29,8 +29,8 @@
 namespace connectivity
 {
 
-    //= OPooledConnection -
-    //= allows to pool a real connection
+    // OPooledConnection -
+    // allows to pool a real connection
 
     typedef ::cppu::WeakComponentImplHelper2<    ::com::sun::star::sdbc::XPooledConnection
                                                 ,::com::sun::star::lang::XEventListener>    OPooledConnection_Base;
diff --git a/connectivity/source/cpool/Zregistration.cxx b/connectivity/source/cpool/Zregistration.cxx
index 8367c970ed0f..2dc50e9d85f4 100644
--- a/connectivity/source/cpool/Zregistration.cxx
+++ b/connectivity/source/cpool/Zregistration.cxx
@@ -28,8 +28,6 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::registry;
 using namespace connectivity;
 
-//= registration
-
 extern "C"
 {
 
diff --git a/connectivity/source/drivers/file/quotedstring.cxx b/connectivity/source/drivers/file/quotedstring.cxx
index 0ff6335f880e..c5fffb1f949e 100644
--- a/connectivity/source/drivers/file/quotedstring.cxx
+++ b/connectivity/source/drivers/file/quotedstring.cxx
@@ -23,9 +23,6 @@
 namespace connectivity
 {
 
-    //= QuotedTokenizedString
-
-
     sal_Int32 QuotedTokenizedString::GetTokenCount( sal_Unicode cTok, sal_Unicode cStrDel ) const
     {
         const sal_Int32 nLen = m_sString.getLength();
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 979b076ddc8c..e52f95ca52d3 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -84,11 +84,6 @@ namespace connectivity
     }
 
 
-
-
-    //= ODriverDelegator
-
-
     ODriverDelegator::ODriverDelegator(const Reference< XComponentContext >& _rxContext)
         : ODriverDelegator_BASE(m_aMutex)
         ,m_xContext(_rxContext)
diff --git a/connectivity/source/drivers/hsqldb/HTools.cxx b/connectivity/source/drivers/hsqldb/HTools.cxx
index 0288a7b698ab..49cfdfd56ad8 100644
--- a/connectivity/source/drivers/hsqldb/HTools.cxx
+++ b/connectivity/source/drivers/hsqldb/HTools.cxx
@@ -23,9 +23,6 @@
 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/HView.cxx b/connectivity/source/drivers/hsqldb/HView.cxx
index 72e9e8af48a6..8c2b987fc1db 100644
--- a/connectivity/source/drivers/hsqldb/HView.cxx
+++ b/connectivity/source/drivers/hsqldb/HView.cxx
@@ -55,10 +55,6 @@ namespace connectivity { namespace hsqldb
     using ::com::sun::star::lang::DisposedException;
     using ::com::sun::star::sdbc::XRow;
 
-
-    //= HView
-
-
     HView::HView( const Reference< XConnection >& _rxConnection, bool _bCaseSensitive,
         const OUString& _rSchemaName, const OUString& _rName )
         :HView_Base( _bCaseSensitive, _rName, _rxConnection->getMetaData(), 0, OUString(), _rSchemaName, OUString() )
diff --git a/connectivity/source/drivers/jdbc/ConnectionLog.cxx b/connectivity/source/drivers/jdbc/ConnectionLog.cxx
index 87f58b491032..efd0de8200f0 100644
--- a/connectivity/source/drivers/jdbc/ConnectionLog.cxx
+++ b/connectivity/source/drivers/jdbc/ConnectionLog.cxx
@@ -43,10 +43,6 @@ namespace connectivity { namespace java { namespace sql {
         }
     }
 
-
-    //= ConnectionLog
-
-
     ConnectionLog::ConnectionLog( const ::comphelper::ResourceBasedEventLogger& _rDriverLog )
         :ConnectionLog_Base( _rDriverLog )
         ,m_nObjectID( lcl_getFreeID( CONNECTION ) )
diff --git a/connectivity/source/drivers/jdbc/ContextClassLoader.cxx b/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
index 3562f6649a5a..240d78e0a2ab 100644
--- a/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
+++ b/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
@@ -30,10 +30,6 @@ namespace connectivity { namespace jdbc
 
     using ::connectivity::java_lang_Object;
 
-
-    //= ContextClassLoaderScope
-
-
     ContextClassLoaderScope::ContextClassLoaderScope( JNIEnv& environment, const GlobalRef< jobject >& newClassLoader,
         const ::comphelper::ResourceBasedEventLogger& _rLoggerForErrors, const Reference< XInterface >& _rxErrorContext )
         :m_environment( environment )
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
index 82fbccd366b8..2b39a6e2ed1b 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
@@ -33,10 +33,6 @@
 
 namespace connectivity { namespace mozab {
 
-
-
-    //= helper
-
     namespace
     {
         typedef NS_STDCALL_FUNCPROTO(nsresult, CardPropertyGetter, nsIAbCard, GetFirstName, (PRUnichar**));
@@ -131,16 +127,10 @@ namespace connectivity { namespace mozab {
     }
 
 
-    //= AttributeMap_Data
-
     struct AttributeMap_Data
     {
     };
 
-
-    //= MLdapAttributeMap
-
-
     MLdapAttributeMap::MLdapAttributeMap()
         :m_pData( new AttributeMap_Data )
     {
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx
index ab020ed9f40f..0562eccbf54a 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx
@@ -31,9 +31,6 @@ namespace connectivity { namespace mozab {
     struct AttributeMap_Data;
     class MQueryHelperResultEntry;
 
-
-    //= class MLdapAttributeMap
-
     /** implements the nsIAbLDAPAttributeMap interface
 
         Somewhere between Mozilla 1.7.5 and SeaMonkey 1.1.12, the LDAP address book
diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx
index 63507adcab5a..f69c031e9866 100644
--- a/connectivity/source/drivers/mysql/YDriver.cxx
+++ b/connectivity/source/drivers/mysql/YDriver.cxx
@@ -60,10 +60,6 @@ namespace connectivity
         }
     }
 
-
-    //= ODriverDelegator
-
-
     ODriverDelegator::ODriverDelegator(const Reference< XComponentContext >& _rxContext)
         : ODriverDelegator_BASE(m_aMutex)
         ,m_xContext(_rxContext)
diff --git a/connectivity/source/inc/hsqldb/HConnection.hxx b/connectivity/source/inc/hsqldb/HConnection.hxx
index 5c380e0a7640..3fbe63c6b657 100644
--- a/connectivity/source/inc/hsqldb/HConnection.hxx
+++ b/connectivity/source/inc/hsqldb/HConnection.hxx
@@ -44,8 +44,8 @@ namespace connectivity
         };
 
 
-        //= OHsqlConnection - wraps all methods to the real connection from the driver
-        //= but when disposed it doesn't dispose the real connection
+        // OHsqlConnection - wraps all methods to the real connection from the driver
+        // but when disposed it doesn't dispose the real connection
 
         typedef ::cppu::WeakComponentImplHelper2<   ::com::sun::star::util::XFlushable
                                                 ,   ::com::sun::star::sdb::application::XTableUIProvider
@@ -128,7 +128,7 @@ namespace connectivity
         };
 
 
-        //= OHsqlConnection
+        // OHsqlConnection
 
         class MethodGuard : public ::osl::MutexGuard
         {
diff --git a/connectivity/source/inc/hsqldb/HTools.hxx b/connectivity/source/inc/hsqldb/HTools.hxx
index fcb91741fc6d..9d42b69bfd7e 100644
--- a/connectivity/source/inc/hsqldb/HTools.hxx
+++ b/connectivity/source/inc/hsqldb/HTools.hxx
@@ -26,10 +26,6 @@
 namespace connectivity { namespace hsqldb
 {
 
-
-
-    //= HTools
-
     class HTools
     {
     public:
diff --git a/connectivity/source/inc/hsqldb/HView.hxx b/connectivity/source/inc/hsqldb/HView.hxx
index 3e3d7cca8884..3f10eca6329a 100644
--- a/connectivity/source/inc/hsqldb/HView.hxx
+++ b/connectivity/source/inc/hsqldb/HView.hxx
@@ -31,10 +31,6 @@
 namespace connectivity { namespace hsqldb
 {
 
-
-
-    //= HView
-
     typedef ::connectivity::sdbcx::OView                                HView_Base;
     typedef ::cppu::ImplHelper1< ::com::sun::star::sdbcx::XAlterView >  HView_IBASE;
     class HView :public HView_Base
diff --git a/connectivity/source/inc/java/ContextClassLoader.hxx b/connectivity/source/inc/java/ContextClassLoader.hxx
index 58e3789c9b60..fa04e0a9ae1c 100644
--- a/connectivity/source/inc/java/ContextClassLoader.hxx
+++ b/connectivity/source/inc/java/ContextClassLoader.hxx
@@ -30,13 +30,6 @@ namespace comphelper
 
 namespace connectivity { namespace jdbc
 {
-
-
-
-    //= ContextClassLoaderScope
-
-    /**
-    */
     class ContextClassLoaderScope
     {
     public:
diff --git a/connectivity/source/inc/java/GlobalRef.hxx b/connectivity/source/inc/java/GlobalRef.hxx
index efa2fa29b31e..760e01886c99 100644
--- a/connectivity/source/inc/java/GlobalRef.hxx
+++ b/connectivity/source/inc/java/GlobalRef.hxx
@@ -28,11 +28,6 @@
 
 namespace connectivity { namespace jdbc
 {
-
-
-
-    //= GlobalRef
-
     /** helper class to hold a local ref to a JNI object
     */
     template< typename T >
diff --git a/connectivity/source/inc/java/LocalRef.hxx b/connectivity/source/inc/java/LocalRef.hxx
index 048f43afc8f6..765cbe9318b9 100644
--- a/connectivity/source/inc/java/LocalRef.hxx
+++ b/connectivity/source/inc/java/LocalRef.hxx
@@ -26,10 +26,6 @@
 namespace connectivity { namespace jdbc
 {
 
-
-
-    //= LocalRef
-
     /** helper class to hold a local ref to a JNI object
 
         Note that this class never actually calls NewLocalRef. It is assumed that all objects
diff --git a/connectivity/source/inc/java/sql/ConnectionLog.hxx b/connectivity/source/inc/java/sql/ConnectionLog.hxx
index 59ffaaab88cc..39aae214ca61 100644
--- a/connectivity/source/inc/java/sql/ConnectionLog.hxx
+++ b/connectivity/source/inc/java/sql/ConnectionLog.hxx
@@ -58,10 +58,6 @@ namespace connectivity
 
 namespace connectivity { namespace java { namespace sql {
 
-
-
-    //= ConnectionLog
-
     typedef ::comphelper::ResourceBasedEventLogger  ConnectionLog_Base;
     class ConnectionLog : public ConnectionLog_Base
     {
diff --git a/connectivity/source/inc/resource/sharedresources.hxx b/connectivity/source/inc/resource/sharedresources.hxx
index 6ecd048e4b79..fadbf354822b 100644
--- a/connectivity/source/inc/resource/sharedresources.hxx
+++ b/connectivity/source/inc/resource/sharedresources.hxx
@@ -31,8 +31,6 @@ namespace connectivity
 
     typedef sal_uInt16  ResourceId;
 
-    //= SharedResources
-
     /** helper class for accessing resources shared by different libraries
         in the connectivity module
     */
diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx
index 6e90f651b31a..0e773b2c998a 100644
--- a/connectivity/source/manager/mdrivermanager.cxx
+++ b/connectivity/source/manager/mdrivermanager.cxx
@@ -58,9 +58,6 @@ void throwNoSuchElementException() throw(NoSuchElementException)
     throw NoSuchElementException();
 }
 
-
-//= ODriverEnumeration
-
 class ODriverEnumeration : public ::cppu::WeakImplHelper1< XEnumeration >
 {
     friend class OSDBCDriverManager;
@@ -108,9 +105,6 @@ Any SAL_CALL ODriverEnumeration::nextElement(  ) throw(NoSuchElementException, W
 }
 
 
-    //= helper
-
-
     /// an STL functor which ensures that a SdbcDriver described by a DriverAccess is loaded
     struct EnsureDriver : public ::std::unary_function< DriverAccess, DriverAccess >
     {
@@ -258,9 +252,6 @@ 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" )
diff --git a/connectivity/source/manager/mdrivermanager.hxx b/connectivity/source/manager/mdrivermanager.hxx
index e2fa4191f64c..ec4dea8baeb2 100644
--- a/connectivity/source/manager/mdrivermanager.hxx
+++ b/connectivity/source/manager/mdrivermanager.hxx
@@ -40,9 +40,6 @@
 namespace drivermanager
 {
 
-
-    //= various
-
     typedef std::map< OUString, css::uno::Reference< css::sdbc::XDriver > > DriverCollection;
 
     struct DriverAccess
@@ -53,7 +50,7 @@ namespace drivermanager
     };
 
 
-    //= OSDBCDriverManager - the one-instance service for managing SDBC drivers
+    // OSDBCDriverManager - the one-instance service for managing SDBC drivers
 
     typedef ::cppu::WeakImplHelper3 <   ::com::sun::star::sdbc::XDriverManager2
                                     ,   ::com::sun::star::lang::XServiceInfo
diff --git a/connectivity/source/manager/mregistration.cxx b/connectivity/source/manager/mregistration.cxx
index ec11e696ca61..038360e6e7d0 100644
--- a/connectivity/source/manager/mregistration.cxx
+++ b/connectivity/source/manager/mregistration.cxx
@@ -27,9 +27,6 @@
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 
-
-//= registration
-
 extern "C"
 {
 
diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index 7a2ad837cfb7..f65601a78f6e 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -4303,10 +4303,6 @@ connectivity::OSQLInternalNode* newNode(const OUString& _NewValue,
     return new connectivity::OSQLInternalNode(_NewValue, eNodeType, nNodeID);
 }
 
-
-//= OParseContext
-
-
 OParseContext::OParseContext()
 {
 }
@@ -4422,9 +4418,6 @@ const Locale& OParseContext::getDefaultLocale()
 	return impl_getLocaleInstance();
 }
 
-
-//= misc
-
 // Der (leider globale) yylval fuer die Uebergabe von
 // Werten vom Scanner an den Parser. Die globale Variable
 // wird nur kurzzeitig verwendet, der Parser liest die Variable
@@ -4490,10 +4483,6 @@ OUString ConvertLikeToken(const OSQLParseNode* pTokenNode, const OSQLParseNode*
 	return aMatchStr.makeStringAndClear();
 }
 
-
-//= OSQLParser
-
-
 sal_uInt32			    OSQLParser::s_nRuleIDs[OSQLParseNode::rule_count + 1];
 OSQLParser::RuleIDMap   OSQLParser::s_aReverseRuleIDLookup;
 OParseContext		    OSQLParser::s_aDefaultContext;
diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l
index 330a853c9d75..1e50927282bd 100644
--- a/connectivity/source/parse/sqlflex.l
+++ b/connectivity/source/parse/sqlflex.l
@@ -59,8 +59,6 @@
 
 using namespace connectivity;
 
-//=============================================================================
-//
 // Erzeugung der Blaetter fuer die Token
 // Blaetter werden generell vom Lexer erzeugt
 
@@ -91,9 +89,6 @@ OSQLScanner* xxx_pGLOBAL_SQLSCAN = NULL;
     xxx_pGLOBAL_SQLSCAN->SQLyyerror(msg);           \
 }
 
-//
-//=============================================================================
-
 %}
 
 %s SQL
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index a45671361930..1293364ba695 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -191,10 +191,6 @@ namespace
 namespace connectivity
 {
 
-
-//= SQLParseNodeParameter
-
-
 SQLParseNodeParameter::SQLParseNodeParameter( const Reference< XConnection >& _rxConnection,
         const Reference< XNumberFormatter >& _xFormatter, const Reference< XPropertySet >& _xField,
         const OUString &_sPredicateTableAlias,
@@ -221,10 +217,6 @@ SQLParseNodeParameter::~SQLParseNodeParameter()
 {
 }
 
-
-//= OSQLParseNode
-
-
 OUString OSQLParseNode::convertDateString(const SQLParseNodeParameter& rParam, const OUString& rString)
 {
     Date aDate = DBTypeConversion::toDate(rString);
diff --git a/connectivity/source/resource/sharedresources.cxx b/connectivity/source/resource/sharedresources.cxx
index 1275774929f0..e69cfa669cf2 100644
--- a/connectivity/source/resource/sharedresources.cxx
+++ b/connectivity/source/resource/sharedresources.cxx
@@ -36,9 +36,6 @@ namespace connectivity
     using ::com::sun::star::uno::XComponentContext;
     using ::com::sun::star::uno::Exception;
 
-
-    //= SharedResources_Impl
-
     class SharedResources_Impl
     {
     private:
@@ -127,9 +124,6 @@ namespace connectivity
         return *s_pInstance;
     }
 
-
-    //= helpers
-
     namespace
     {
         size_t lcl_substitute( OUString& _inout_rString,
@@ -149,10 +143,6 @@ namespace connectivity
         }
     }
 
-
-    //= SharedResources
-
-
     SharedResources::SharedResources()
     {
         SharedResources_Impl::registerClient();