Remove unneccessary comments

Change-Id: I939160ae72fecbe3d4a60ce755730bd4c38497fb
Reviewed-on: https://gerrit.libreoffice.org/8182
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

33 files changed, 380 insertions, 380 deletions

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() )