fdo#62475 removed pointless comments

Change-Id: Ic3743e48ef9055933ff040c180561ef41b3a2990
Reviewed-on: https://gerrit.libreoffice.org/5174
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>

6 files changed, 5 insertions, 92 deletions

diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index 5f42210e637b..669a8025c5c9 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -96,8 +96,6 @@ using namespace com::sun::star::packages::zip;
 using namespace com::sun::star::packages::manifest;
 using namespace com::sun::star::packages::zip::ZipConstants;
 
-//===========================================================================
-
 class ActiveDataStreamer : public ::cppu::WeakImplHelper1< XActiveDataStreamer >
 {
     uno::Reference< XStream > mStream;
@@ -135,8 +133,6 @@ class DummyInputStream : public ::cppu::WeakImplHelper1< XInputStream >
         {}
 };
 
-//===========================================================================
-
 ZipPackage::ZipPackage ( const uno::Reference < XComponentContext > &xContext )
 : m_aMutexHolder( new SotMutexHolder )
 , m_nStartKeyGenerationID( xml::crypto::DigestID::SHA1 )
@@ -184,7 +180,6 @@ sal_Bool ZipPackage::isLocalFile() const
     return !aSystemPath.isEmpty();
 }
 
-//--------------------------------------------------------
 void ZipPackage::parseManifest()
 {
     if ( m_nFormat == embed::StorageFormats::PACKAGE )
@@ -378,7 +373,6 @@ void ZipPackage::parseManifest()
                 }
             }
 
-
             if ( !bManifestParsed )
             {
                 // the manifest.xml could not be successfully parsed, this is an inconsistent package
@@ -434,7 +428,6 @@ void ZipPackage::parseManifest()
     }
 }
 
-//--------------------------------------------------------
 void ZipPackage::parseContentType()
 {
     if ( m_nFormat == embed::StorageFormats::OFOPXML )
@@ -503,7 +496,6 @@ void ZipPackage::parseContentType()
     }
 }
 
-//--------------------------------------------------------
 void ZipPackage::getZipFileContents()
 {
     auto_ptr < ZipEnumeration > pEnum ( m_pZipFile->entries() );
@@ -575,7 +567,6 @@ void ZipPackage::getZipFileContents()
         parseContentType();
 }
 
-//--------------------------------------------------------
 void SAL_CALL ZipPackage::initialize( const uno::Sequence< Any >& aArguments )
         throw( Exception, RuntimeException )
 {
@@ -785,7 +776,6 @@ void SAL_CALL ZipPackage::initialize( const uno::Sequence< Any >& aArguments )
     }
 }
 
-//--------------------------------------------------------
 Any SAL_CALL ZipPackage::getByHierarchicalName( const OUString& aName )
         throw( NoSuchElementException, RuntimeException )
 {
@@ -867,7 +857,6 @@ Any SAL_CALL ZipPackage::getByHierarchicalName( const OUString& aName )
     }
 }
 
-//--------------------------------------------------------
 sal_Bool SAL_CALL ZipPackage::hasByHierarchicalName( const OUString& aName )
         throw( RuntimeException )
 {
@@ -947,14 +936,13 @@ sal_Bool SAL_CALL ZipPackage::hasByHierarchicalName( const OUString& aName )
     }
 }
 
-//--------------------------------------------------------
 uno::Reference< XInterface > SAL_CALL ZipPackage::createInstance()
         throw( Exception, RuntimeException )
 {
     uno::Reference < XInterface > xRef = *( new ZipPackageStream ( *this, m_xContext, m_bAllowRemoveOnInsert ) );
     return xRef;
 }
-//--------------------------------------------------------
+
 uno::Reference< XInterface > SAL_CALL ZipPackage::createInstanceWithArguments( const uno::Sequence< Any >& aArguments )
         throw( Exception, RuntimeException )
 {
@@ -970,7 +958,6 @@ uno::Reference< XInterface > SAL_CALL ZipPackage::createInstanceWithArguments( c
     return xRef;
 }
 
-//--------------------------------------------------------
 void ZipPackage::WriteMimetypeMagicFile( ZipOutputStream& aZipOut )
 {
     const OUString sMime ("mimetype");
@@ -983,7 +970,6 @@ void ZipPackage::WriteMimetypeMagicFile( ZipOutputStream& aZipOut )
     uno::Sequence< sal_Int8 > aType( ( sal_Int8* )sMediaType.getStr(),
                                      nBufferLength );
 
-
     pEntry->sPath = sMime;
     pEntry->nMethod = STORED;
     pEntry->nSize = pEntry->nCompressedSize = nBufferLength;
@@ -1008,7 +994,6 @@ void ZipPackage::WriteMimetypeMagicFile( ZipOutputStream& aZipOut )
     }
 }
 
-//--------------------------------------------------------
 void ZipPackage::WriteManifest( ZipOutputStream& aZipOut, const vector< uno::Sequence < PropertyValue > >& aManList )
 {
     // Write the manifest
@@ -1043,7 +1028,6 @@ void ZipPackage::WriteManifest( ZipOutputStream& aZipOut, const vector< uno::Seq
     aZipOut.closeEntry();
 }
 
-//--------------------------------------------------------
 void ZipPackage::WriteContentTypes( ZipOutputStream& aZipOut, const vector< uno::Sequence < PropertyValue > >& aManList )
 {
     const OUString sFullPath ("FullPath");
@@ -1097,7 +1081,6 @@ void ZipPackage::WriteContentTypes( ZipOutputStream& aZipOut, const vector< uno:
     aZipOut.closeEntry();
 }
 
-//--------------------------------------------------------
 void ZipPackage::ConnectTo( const uno::Reference< io::XInputStream >& xInStream )
 {
     m_xContentSeek.set( xInStream, uno::UNO_QUERY_THROW );
@@ -1111,7 +1094,6 @@ void ZipPackage::ConnectTo( const uno::Reference< io::XInputStream >& xInStream
         m_pZipFile = new ZipFile ( m_xContentStream, m_xContext, sal_False );
 }
 
-//--------------------------------------------------------
 uno::Reference< io::XInputStream > ZipPackage::writeTempFile()
 {
     // In case the target local file does not exist or empty
@@ -1300,7 +1282,6 @@ uno::Reference< io::XInputStream > ZipPackage::writeTempFile()
     return xResult;
 }
 
-//--------------------------------------------------------
 uno::Reference< XActiveDataStreamer > ZipPackage::openOriginalForOutput()
 {
     // open and truncate the original file
@@ -1354,7 +1335,6 @@ uno::Reference< XActiveDataStreamer > ZipPackage::openOriginalForOutput()
     return xSink;
 }
 
-//--------------------------------------------------------
 void SAL_CALL ZipPackage::commitChanges()
         throw( WrappedTargetException, RuntimeException )
 {
@@ -1522,7 +1502,6 @@ void SAL_CALL ZipPackage::commitChanges()
     m_bMediaTypeFallbackUsed = sal_False;
 }
 
-//--------------------------------------------------------
 void ZipPackage::DisconnectFromTargetAndThrowException_Impl( const uno::Reference< io::XInputStream >& xTempStream )
 {
     m_xStream = uno::Reference< io::XStream >( xTempStream, uno::UNO_QUERY );
@@ -1551,7 +1530,6 @@ void ZipPackage::DisconnectFromTargetAndThrowException_Impl( const uno::Referenc
                                     makeAny ( aException ) );
 }
 
-//--------------------------------------------------------
 const uno::Sequence< sal_Int8 > ZipPackage::GetEncryptionKey()
 {
     uno::Sequence< sal_Int8 > aResult;
@@ -1581,13 +1559,11 @@ const uno::Sequence< sal_Int8 > ZipPackage::GetEncryptionKey()
     return aResult;
 }
 
-//--------------------------------------------------------
 sal_Bool SAL_CALL ZipPackage::hasPendingChanges()
         throw( RuntimeException )
 {
     return sal_False;
 }
-//--------------------------------------------------------
 Sequence< ElementChange > SAL_CALL ZipPackage::getPendingChanges()
         throw( RuntimeException )
 {
@@ -1604,45 +1580,41 @@ uno::Reference < XInterface >SAL_CALL ZipPackage_createInstance(
     return uno::Reference< XInterface >( *new ZipPackage( comphelper::getComponentContext(xMgr) ) );
 }
 
-//--------------------------------------------------------
 OUString ZipPackage::static_getImplementationName()
 {
     return OUString("com.sun.star.packages.comp.ZipPackage");
 }
 
-//--------------------------------------------------------
 Sequence< OUString > ZipPackage::static_getSupportedServiceNames()
 {
     uno::Sequence< OUString > aNames( 1 );
     aNames[0] = OUString("com.sun.star.packages.Package");
     return aNames;
 }
-//--------------------------------------------------------
+
 sal_Bool SAL_CALL ZipPackage::static_supportsService( OUString const & rServiceName )
 {
     return rServiceName == getSupportedServiceNames()[0];
 }
 
-//--------------------------------------------------------
 OUString ZipPackage::getImplementationName()
     throw ( RuntimeException )
 {
     return static_getImplementationName();
 }
 
-//--------------------------------------------------------
 Sequence< OUString > ZipPackage::getSupportedServiceNames()
     throw ( RuntimeException )
 {
     return static_getSupportedServiceNames();
 }
-//--------------------------------------------------------
+
 sal_Bool SAL_CALL ZipPackage::supportsService( OUString const & rServiceName )
     throw ( RuntimeException )
 {
     return static_supportsService ( rServiceName );
 }
-//--------------------------------------------------------
+
 uno::Reference < XSingleServiceFactory > ZipPackage::createServiceFactory( uno::Reference < XMultiServiceFactory > const & rServiceFactory )
 {
     return cppu::createSingleFactory ( rServiceFactory,
@@ -1653,7 +1625,6 @@ uno::Reference < XSingleServiceFactory > ZipPackage::createServiceFactory( uno::
 
 namespace { struct lcl_ImplId : public rtl::Static< ::cppu::OImplementationId, lcl_ImplId > {}; }
 
-//--------------------------------------------------------
 Sequence< sal_Int8 > ZipPackage::getUnoTunnelImplementationId( void )
     throw ( RuntimeException )
 {
@@ -1661,7 +1632,6 @@ Sequence< sal_Int8 > ZipPackage::getUnoTunnelImplementationId( void )
     return rId.getImplementationId();
 }
 
-//--------------------------------------------------------
 sal_Int64 SAL_CALL ZipPackage::getSomething( const uno::Sequence< sal_Int8 >& aIdentifier )
     throw( RuntimeException )
 {
@@ -1670,14 +1640,12 @@ sal_Int64 SAL_CALL ZipPackage::getSomething( const uno::Sequence< sal_Int8 >& aI
     return 0;
 }
 
-//--------------------------------------------------------
 uno::Reference< XPropertySetInfo > SAL_CALL ZipPackage::getPropertySetInfo()
         throw( RuntimeException )
 {
     return uno::Reference < XPropertySetInfo > ();
 }
 
-//--------------------------------------------------------
 void SAL_CALL ZipPackage::setPropertyValue( const OUString& aPropertyName, const Any& aValue )
         throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException )
 {
@@ -1774,7 +1742,6 @@ void SAL_CALL ZipPackage::setPropertyValue( const OUString& aPropertyName, const
         throw UnknownPropertyException(OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() );
 }
 
-//--------------------------------------------------------
 Any SAL_CALL ZipPackage::getPropertyValue( const OUString& PropertyName )
         throw( UnknownPropertyException, WrappedTargetException, RuntimeException )
 {
@@ -1824,22 +1791,18 @@ Any SAL_CALL ZipPackage::getPropertyValue( const OUString& PropertyName )
     }
     throw UnknownPropertyException(OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() );
 }
-//--------------------------------------------------------
 void SAL_CALL ZipPackage::addPropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< XPropertyChangeListener >& /*xListener*/ )
         throw( UnknownPropertyException, WrappedTargetException, RuntimeException )
 {
 }
-//--------------------------------------------------------
 void SAL_CALL ZipPackage::removePropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< XPropertyChangeListener >& /*aListener*/ )
         throw( UnknownPropertyException, WrappedTargetException, RuntimeException )
 {
 }
-//--------------------------------------------------------
 void SAL_CALL ZipPackage::addVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< XVetoableChangeListener >& /*aListener*/ )
         throw( UnknownPropertyException, WrappedTargetException, RuntimeException )
 {
 }
-//--------------------------------------------------------
 void SAL_CALL ZipPackage::removeVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< XVetoableChangeListener >& /*aListener*/ )
         throw( UnknownPropertyException, WrappedTargetException, RuntimeException )
 {
diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx
index 2f9365556576..976c230a9f0d 100644
--- a/package/source/zippackage/ZipPackageFolder.cxx
+++ b/package/source/zippackage/ZipPackageFolder.cxx
@@ -72,7 +72,6 @@ ZipPackageFolder::ZipPackageFolder ( sal_Int32 nFormat,
         rCachedImplId = getImplementationId();
 }
 
-
 ZipPackageFolder::~ZipPackageFolder()
 {
 }
@@ -352,7 +351,6 @@ bool ZipPackageFolder::saveChild( const OUString &rShortName, const ContentInfo
         aPropSet[PKG_MNFST_FULLPATH].Name = sFullPathProperty;
         aPropSet[PKG_MNFST_FULLPATH].Value <<= pTempEntry->sPath;
 
-
         OSL_ENSURE( rInfo.pStream->GetStreamMode() != PACKAGE_STREAM_NOTSET, "Unacceptable ZipPackageStream mode!" );
 
         sal_Bool bRawStream = sal_False;
diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx
index 0937e4a37d80..78e647e35812 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -124,7 +124,6 @@ void ZipPackageStream::setZipEntryOnLoading( const ZipEntry &rInEntry )
         bToBeCompressed = sal_False;
 }
 
-//--------------------------------------------------------------------------
 void ZipPackageStream::CloseOwnStreamIfAny()
 {
     if ( xStream.is() )
@@ -135,7 +134,6 @@ void ZipPackageStream::CloseOwnStreamIfAny()
     }
 }
 
-//--------------------------------------------------------------------------
 uno::Reference< io::XInputStream > ZipPackageStream::GetOwnSeekStream()
 {
     if ( !m_bHasSeekable && xStream.is() )
@@ -156,7 +154,6 @@ uno::Reference< io::XInputStream > ZipPackageStream::GetOwnSeekStream()
     return xStream;
 }
 
-//--------------------------------------------------------------------------
 uno::Reference< io::XInputStream > ZipPackageStream::GetRawEncrStreamNoHeaderCopy()
 {
     if ( m_nStreamMode != PACKAGE_STREAM_RAW || !GetOwnSeekStream().is() )
@@ -189,19 +186,16 @@ uno::Reference< io::XInputStream > ZipPackageStream::GetRawEncrStreamNoHeaderCop
     return xTempIn;
 }
 
-//--------------------------------------------------------------------------
 sal_Int32 ZipPackageStream::GetEncryptionAlgorithm() const
 {
     return m_nImportedEncryptionAlgorithm ? m_nImportedEncryptionAlgorithm : rZipPackage.GetEncAlgID();
 }
 
-//--------------------------------------------------------------------------
 sal_Int32 ZipPackageStream::GetBlockSize() const
 {
     return GetEncryptionAlgorithm() == ::com::sun::star::xml::crypto::CipherID::AES_CBC_W3C_PADDING ? 16 : 8;
 }
 
-//--------------------------------------------------------------------------
 ::rtl::Reference< EncryptionData > ZipPackageStream::GetEncryptionData( bool bUseWinEncoding )
 {
     ::rtl::Reference< EncryptionData > xResult;
@@ -217,7 +211,6 @@ sal_Int32 ZipPackageStream::GetBlockSize() const
     return xResult;
 }
 
-//--------------------------------------------------------------------------
 uno::Sequence< sal_Int8 > ZipPackageStream::GetEncryptionKey( bool bUseWinEncoding )
 {
     uno::Sequence< sal_Int8 > aResult;
@@ -254,7 +247,6 @@ uno::Sequence< sal_Int8 > ZipPackageStream::GetEncryptionKey( bool bUseWinEncodi
     return aResult;
 }
 
-//--------------------------------------------------------------------------
 sal_Int32 ZipPackageStream::GetStartKeyGenID()
 {
     // generally should all the streams use the same Start Key
@@ -262,7 +254,6 @@ sal_Int32 ZipPackageStream::GetStartKeyGenID()
     return m_nImportedStartKeyAlgorithm ? m_nImportedStartKeyAlgorithm : rZipPackage.GetStartKeyGenID();
 }
 
-//--------------------------------------------------------------------------
 uno::Reference< io::XInputStream > ZipPackageStream::TryToGetRawFromDataStream( sal_Bool bAddHeaderForEncr )
 {
     if ( m_nStreamMode != PACKAGE_STREAM_DATA || !GetOwnSeekStream().is() || ( bAddHeaderForEncr && !bToBeEncrypted ) )
@@ -370,7 +361,6 @@ uno::Reference< io::XInputStream > ZipPackageStream::TryToGetRawFromDataStream(
     throw io::IOException(OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() );
 }
 
-//--------------------------------------------------------------------------
 sal_Bool ZipPackageStream::ParsePackageRawStream()
 {
     OSL_ENSURE( GetOwnSeekStream().is(), "A stream must be provided!\n" );
@@ -454,7 +444,6 @@ void ZipPackageStream::SetPackageMember( sal_Bool bNewValue )
 }
 
 // XActiveDataSink
-//--------------------------------------------------------------------------
 void SAL_CALL ZipPackageStream::setInputStream( const uno::Reference< io::XInputStream >& aStream )
         throw( RuntimeException )
 {
@@ -467,7 +456,6 @@ void SAL_CALL ZipPackageStream::setInputStream( const uno::Reference< io::XInput
     m_nStreamMode = PACKAGE_STREAM_DETECT;
 }
 
-//--------------------------------------------------------------------------
 uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getRawData()
         throw( RuntimeException )
 {
@@ -496,7 +484,6 @@ uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getRawData()
     }
 }
 
-//--------------------------------------------------------------------------
 uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getInputStream()
         throw( RuntimeException )
 {
@@ -528,7 +515,6 @@ uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getInputStream()
 }
 
 // XDataSinkEncrSupport
-//--------------------------------------------------------------------------
 uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getDataStream()
         throw ( packages::WrongPasswordException,
                 io::IOException,
@@ -572,7 +558,6 @@ uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getDataStream()
         return uno::Reference< io::XInputStream >();
 }
 
-//--------------------------------------------------------------------------
 uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getRawStream()
         throw ( packages::NoEncryptionException,
                 io::IOException,
@@ -606,8 +591,6 @@ uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getRawStream()
     throw packages::NoEncryptionException(OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() );
 }
 
-
-//--------------------------------------------------------------------------
 void SAL_CALL ZipPackageStream::setDataStream( const uno::Reference< io::XInputStream >& aStream )
         throw ( io::IOException,
                 RuntimeException )
@@ -616,7 +599,6 @@ void SAL_CALL ZipPackageStream::setDataStream( const uno::Reference< io::XInputS
     m_nStreamMode = PACKAGE_STREAM_DATA;
 }
 
-//--------------------------------------------------------------------------
 void SAL_CALL ZipPackageStream::setRawStream( const uno::Reference< io::XInputStream >& aStream )
         throw ( packages::EncryptionNotAllowedException,
                 packages::NoRawFormatException,
@@ -647,7 +629,6 @@ void SAL_CALL ZipPackageStream::setRawStream( const uno::Reference< io::XInputSt
     m_nStreamMode = PACKAGE_STREAM_RAW;
 }
 
-//--------------------------------------------------------------------------
 uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getPlainRawStream()
         throw ( io::IOException,
                 uno::RuntimeException )
@@ -680,7 +661,6 @@ uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getPlainRawStream(
 
 // XUnoTunnel
 
-//--------------------------------------------------------------------------
 sal_Int64 SAL_CALL ZipPackageStream::getSomething( const Sequence< sal_Int8 >& aIdentifier )
     throw( RuntimeException )
 {
@@ -692,7 +672,6 @@ sal_Int64 SAL_CALL ZipPackageStream::getSomething( const Sequence< sal_Int8 >& a
 }
 
 // XPropertySet
-//--------------------------------------------------------------------------
 void SAL_CALL ZipPackageStream::setPropertyValue( const OUString& aPropertyName, const Any& aValue )
         throw( beans::UnknownPropertyException, beans::PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException )
 {
@@ -851,7 +830,6 @@ void SAL_CALL ZipPackageStream::setPropertyValue( const OUString& aPropertyName,
         throw beans::UnknownPropertyException(OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() );
 }
 
-//--------------------------------------------------------------------------
 Any SAL_CALL ZipPackageStream::getPropertyValue( const OUString& PropertyName )
         throw( beans::UnknownPropertyException, WrappedTargetException, RuntimeException )
 {
@@ -895,21 +873,18 @@ Any SAL_CALL ZipPackageStream::getPropertyValue( const OUString& PropertyName )
         throw beans::UnknownPropertyException(OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() );
 }
 
-//--------------------------------------------------------------------------
 void ZipPackageStream::setSize ( const sal_Int64 nNewSize )
 {
     if ( aEntry.nCompressedSize != nNewSize )
         aEntry.nMethod = DEFLATED;
     aEntry.nSize = nNewSize;
 }
-//--------------------------------------------------------------------------
 OUString ZipPackageStream::getImplementationName()
     throw ( RuntimeException )
 {
     return OUString ("ZipPackageStream");
 }
 
-//--------------------------------------------------------------------------
 Sequence< OUString > ZipPackageStream::getSupportedServiceNames()
     throw ( RuntimeException )
 {
@@ -917,7 +892,7 @@ Sequence< OUString > ZipPackageStream::getSupportedServiceNames()
     aNames[0] = "com.sun.star.packages.PackageStream";
     return aNames;
 }
-//--------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ZipPackageStream::supportsService( OUString const & rServiceName )
     throw ( RuntimeException )
 {
diff --git a/package/source/zippackage/wrapstreamforshare.cxx b/package/source/zippackage/wrapstreamforshare.cxx
index 171faad91456..8e181294dfcf 100644
--- a/package/source/zippackage/wrapstreamforshare.cxx
+++ b/package/source/zippackage/wrapstreamforshare.cxx
@@ -23,7 +23,6 @@
 
 using namespace ::com::sun::star;
 
-
 WrapStreamForShare::WrapStreamForShare( const uno::Reference< io::XInputStream >& xInStream,
                                         const SotMutexHolderRef& rMutexRef )
 : m_rMutexRef( rMutexRef )
diff --git a/package/source/zippackage/wrapstreamforshare.hxx b/package/source/zippackage/wrapstreamforshare.hxx
index eed822209c79..de9db14b1bd5 100644
--- a/package/source/zippackage/wrapstreamforshare.hxx
+++ b/package/source/zippackage/wrapstreamforshare.hxx
@@ -53,7 +53,6 @@ public:
     virtual void SAL_CALL closeInput(  )
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
 
-
     //XSeekable
     virtual void SAL_CALL seek( sal_Int64 location ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
     virtual sal_Int64 SAL_CALL getPosition() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
diff --git a/package/source/zippackage/zipfileaccess.cxx b/package/source/zippackage/zipfileaccess.cxx
index 5f30ee9b7233..b0acad2686fe 100644
--- a/package/source/zippackage/zipfileaccess.cxx
+++ b/package/source/zippackage/zipfileaccess.cxx
@@ -34,10 +34,8 @@
 
 #include <memory>
 
-
 using namespace ::com::sun::star;
 
-// ----------------------------------------------------------------
 OZipFileAccess::OZipFileAccess( const uno::Reference< uno::XComponentContext >& rxContext )
 : m_aMutexHolder( new SotMutexHolder )
 , m_xContext( rxContext )
@@ -49,7 +47,6 @@ OZipFileAccess::OZipFileAccess( const uno::Reference< uno::XComponentContext >&
         throw uno::RuntimeException(OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() );
 }
 
-// ----------------------------------------------------------------
 OZipFileAccess::~OZipFileAccess()
 {
     {
@@ -65,7 +62,6 @@ OZipFileAccess::~OZipFileAccess()
     }
 }
 
-// ----------------------------------------------------------------
 uno::Sequence< OUString > OZipFileAccess::GetPatternsFromString_Impl( const OUString& aString )
 {
     if ( aString.isEmpty() )
@@ -112,7 +108,6 @@ uno::Sequence< OUString > OZipFileAccess::GetPatternsFromString_Impl( const OUSt
     return aPattern;
 }
 
-// ----------------------------------------------------------------
 sal_Bool OZipFileAccess::StringGoodForPattern_Impl( const OUString& aString,
                                                     const uno::Sequence< OUString >& aPattern )
 {
@@ -161,7 +156,6 @@ sal_Bool OZipFileAccess::StringGoodForPattern_Impl( const OUString& aString,
 }
 
 // XInitialization
-// ----------------------------------------------------------------
 void SAL_CALL OZipFileAccess::initialize( const uno::Sequence< uno::Any >& aArguments )
     throw ( uno::Exception,
             uno::RuntimeException )
@@ -226,7 +220,6 @@ void SAL_CALL OZipFileAccess::initialize( const uno::Sequence< uno::Any >& aArgu
 }
 
 // XNameAccess
-// ----------------------------------------------------------------
 uno::Any SAL_CALL OZipFileAccess::getByName( const OUString& aName )
     throw ( container::NoSuchElementException,
             lang::WrappedTargetException,
@@ -255,7 +248,6 @@ uno::Any SAL_CALL OZipFileAccess::getByName( const OUString& aName )
     return uno::makeAny ( xEntryStream );
 }
 
-// ----------------------------------------------------------------
 uno::Sequence< OUString > SAL_CALL OZipFileAccess::getElementNames()
     throw ( uno::RuntimeException )
 {
@@ -290,7 +282,6 @@ uno::Sequence< OUString > SAL_CALL OZipFileAccess::getElementNames()
     return aNames;
 }
 
-// ----------------------------------------------------------------
 sal_Bool SAL_CALL OZipFileAccess::hasByName( const OUString& aName )
     throw (uno::RuntimeException)
 {
@@ -307,7 +298,6 @@ sal_Bool SAL_CALL OZipFileAccess::hasByName( const OUString& aName )
     return ( aIter != m_pZipFile->GetEntryHash().end() );
 }
 
-// ----------------------------------------------------------------
 uno::Type SAL_CALL OZipFileAccess::getElementType()
     throw ( uno::RuntimeException )
 {
@@ -322,7 +312,6 @@ uno::Type SAL_CALL OZipFileAccess::getElementType()
     return getCppuType( ( const uno::Reference< io::XInputStream >* )NULL );
 }
 
-// ----------------------------------------------------------------
 sal_Bool SAL_CALL OZipFileAccess::hasElements()
     throw ( uno::RuntimeException )
 {
@@ -338,7 +327,6 @@ sal_Bool SAL_CALL OZipFileAccess::hasElements()
 }
 
 // XZipFileAccess
-// ----------------------------------------------------------------
 uno::Reference< io::XInputStream > SAL_CALL OZipFileAccess::getStreamByPattern( const OUString& aPatternString )
     throw ( container::NoSuchElementException,
             io::IOException,
@@ -374,7 +362,6 @@ uno::Reference< io::XInputStream > SAL_CALL OZipFileAccess::getStreamByPattern(
 }
 
 // XComponent
-// ----------------------------------------------------------------
 void SAL_CALL OZipFileAccess::dispose()
     throw ( uno::RuntimeException )
 {
@@ -406,7 +393,6 @@ void SAL_CALL OZipFileAccess::dispose()
     m_bDisposed = sal_True;
 }
 
-// ----------------------------------------------------------------
 void SAL_CALL OZipFileAccess::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
     throw ( uno::RuntimeException )
 {
@@ -420,7 +406,6 @@ void SAL_CALL OZipFileAccess::addEventListener( const uno::Reference< lang::XEve
     m_pListenersContainer->addInterface( xListener );
 }
 
-// ----------------------------------------------------------------
 void SAL_CALL OZipFileAccess::removeEventListener( const uno::Reference< lang::XEventListener >& xListener )
     throw ( uno::RuntimeException )
 {
@@ -433,7 +418,6 @@ void SAL_CALL OZipFileAccess::removeEventListener( const uno::Reference< lang::X
         m_pListenersContainer->removeInterface( xListener );
 }
 
-//-------------------------------------------------------------------------
 uno::Sequence< OUString > SAL_CALL OZipFileAccess::impl_staticGetSupportedServiceNames()
 {
     uno::Sequence< OUString > aRet(2);
@@ -442,27 +426,23 @@ uno::Sequence< OUString > SAL_CALL OZipFileAccess::impl_staticGetSupportedServic
     return aRet;
 }
 
-//-------------------------------------------------------------------------
 OUString SAL_CALL OZipFileAccess::impl_staticGetImplementationName()
 {
     return OUString("com.sun.star.comp.package.zip.ZipFileAccess");
 }
 
-//-------------------------------------------------------------------------
 uno::Reference< uno::XInterface > SAL_CALL OZipFileAccess::impl_staticCreateSelfInstance(
             const uno::Reference< lang::XMultiServiceFactory >& rxMSF )
 {
     return uno::Reference< uno::XInterface >( *new OZipFileAccess( comphelper::getComponentContext(rxMSF) ) );
 }
 
-//-------------------------------------------------------------------------
 OUString SAL_CALL OZipFileAccess::getImplementationName()
     throw ( uno::RuntimeException )
 {
     return impl_staticGetImplementationName();
 }
 
-//-------------------------------------------------------------------------
 sal_Bool SAL_CALL OZipFileAccess::supportsService( const OUString& ServiceName )
     throw ( uno::RuntimeException )
 {
@@ -475,7 +455,6 @@ sal_Bool SAL_CALL OZipFileAccess::supportsService( const OUString& ServiceName )
     return sal_False;
 }
 
-//-------------------------------------------------------------------------
 uno::Sequence< OUString > SAL_CALL OZipFileAccess::getSupportedServiceNames()
     throw ( uno::RuntimeException )
 {