strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tdf#123936 Formatting files in module package with clang-format

Browse source 
Change-Id: I3ff80c6c636003d468f384e0d6fbfb5233e0b4da
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105696
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
This commit is contained in:
Philipp Hofer 2020-11-12 13:09:45 +01:00 committed by Christian Lohmaier
parent 4d4e95be17
commit eb4c2e96f3
10 changed files with 58 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
package/inc/EncryptedDataHeader.hxx
View file

@ -42,7 +42,8 @@
*/
const sal_uInt32 n_ConstHeader = 0x05024d4dL; // "MM\002\005"
const sal_Int32 n_ConstHeaderSize = 38; // + salt length + iv length + digest length + mediatype length
const sal_Int32 n_ConstHeaderSize
= 38; // + salt length + iv length + digest length + mediatype length
const sal_Int16 n_ConstCurrentVersion = 1;
#endif

24
package/inc/PackageConstants.hxx
View file

@ -30,22 +30,22 @@ const sal_Int32 n_ConstDigestLength = 1024;
const sal_Int32 n_ConstDigestDecrypt = 1056; // 1024 + 32
// the constants related to the manifest.xml entries
#define PKG_MNFST_FULLPATH 0 //FullPath (Put full-path property first for MBA)
#define PKG_MNFST_VERSION 1 //Version
#define PKG_MNFST_MEDIATYPE 2 //MediaType
#define PKG_MNFST_FULLPATH 0 //FullPath (Put full-path property first for MBA)
#define PKG_MNFST_VERSION 1 //Version
#define PKG_MNFST_MEDIATYPE 2 //MediaType
#define PKG_MNFST_INIVECTOR 3 //InitialisationVector
#define PKG_MNFST_SALT 4 //Salt
#define PKG_MNFST_ITERATION 5 //IterationCount
#define PKG_MNFST_UCOMPSIZE 6 //Size
#define PKG_MNFST_DIGEST 7 //Digest
#define PKG_MNFST_ENCALG 8 //EncryptionAlgorithm
#define PKG_MNFST_STARTALG 9 //StartKeyAlgorithm
#define PKG_MNFST_DIGESTALG 10 //DigestAlgorithm
#define PKG_MNFST_INIVECTOR 3 //InitialisationVector
#define PKG_MNFST_SALT 4 //Salt
#define PKG_MNFST_ITERATION 5 //IterationCount
#define PKG_MNFST_UCOMPSIZE 6 //Size
#define PKG_MNFST_DIGEST 7 //Digest
#define PKG_MNFST_ENCALG 8 //EncryptionAlgorithm
#define PKG_MNFST_STARTALG 9 //StartKeyAlgorithm
#define PKG_MNFST_DIGESTALG 10 //DigestAlgorithm
#define PKG_MNFST_DERKEYSIZE 11 //DerivedKeySize
#define PKG_SIZE_NOENCR_MNFST 3
#define PKG_SIZE_ENCR_MNFST 12
#define PKG_SIZE_ENCR_MNFST 12
// the properties related constants
#define ENCRYPTION_KEY_PROPERTY "EncryptionKey"

7
package/inc/ZipEnumeration.hxx
View file

@ -23,12 +23,13 @@
class ZipEnumeration final
{
EntryHash &rEntryHash;
EntryHash& rEntryHash;
EntryHash::const_iterator aIterator;
public:
bool hasMoreElements();
const ZipEntry * nextElement();
ZipEnumeration( EntryHash &rNewEntryHash );
const ZipEntry* nextElement();
ZipEnumeration(EntryHash& rNewEntryHash);
~ZipEnumeration();
};

6
package/source/xstor/disposelistener.hxx
View file

@ -25,18 +25,18 @@
#include <osl/mutex.hxx>
class OStorage;
class OChildDispListener_Impl : public ::cppu::WeakImplHelper < css::lang::XEventListener >
class OChildDispListener_Impl : public ::cppu::WeakImplHelper<css::lang::XEventListener>
{
::osl::Mutex m_aMutex;
OStorage* m_pStorage;
public:
explicit OChildDispListener_Impl( OStorage& aStorage );
explicit OChildDispListener_Impl(OStorage& aStorage);
virtual ~OChildDispListener_Impl() override;
void OwnerIsDisposed();
virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
virtual void SAL_CALL disposing(const css::lang::EventObject& Source) override;
};
#endif

15
package/source/zipapi/ZipEnumeration.cxx
View file

@ -21,18 +21,13 @@
/** Provides an Enumeration over the contents of a Zip file */
ZipEnumeration::ZipEnumeration( EntryHash & rNewEntryHash)
: rEntryHash(rNewEntryHash)
, aIterator(rEntryHash.begin())
ZipEnumeration::ZipEnumeration(EntryHash& rNewEntryHash)
: rEntryHash(rNewEntryHash)
, aIterator(rEntryHash.begin())
{
}
ZipEnumeration::~ZipEnumeration()
{
}
bool ZipEnumeration::hasMoreElements()
{
return (aIterator != rEntryHash.end());
}
ZipEnumeration::~ZipEnumeration() {}
bool ZipEnumeration::hasMoreElements() { return (aIterator != rEntryHash.end()); }
const ZipEntry* ZipEnumeration::nextElement()
{

26
package/source/zippackage/ZipPackageFolderEnumeration.cxx
View file

@ -30,25 +30,23 @@ using namespace com::sun::star;
#define THROW_WHERE ""
#endif
ZipPackageFolderEnumeration::ZipPackageFolderEnumeration ( ContentHash &rInput)
: rContents (rInput)
, aIterator (rContents.begin())
ZipPackageFolderEnumeration::ZipPackageFolderEnumeration(ContentHash& rInput)
: rContents(rInput)
, aIterator(rContents.begin())
{
}
ZipPackageFolderEnumeration::~ZipPackageFolderEnumeration()
{
}
ZipPackageFolderEnumeration::~ZipPackageFolderEnumeration() {}
sal_Bool SAL_CALL ZipPackageFolderEnumeration::hasMoreElements( )
sal_Bool SAL_CALL ZipPackageFolderEnumeration::hasMoreElements()
{
return (aIterator != rContents.end() );
return (aIterator != rContents.end());
}
uno::Any SAL_CALL ZipPackageFolderEnumeration::nextElement( )
uno::Any SAL_CALL ZipPackageFolderEnumeration::nextElement()
{
uno::Any aAny;
if (aIterator == rContents.end() )
throw container::NoSuchElementException(THROW_WHERE );
if (aIterator == rContents.end())
throw container::NoSuchElementException(THROW_WHERE);
aAny <<= (*aIterator).second->xTunnel;
++aIterator;
return aAny;
@ -59,13 +57,13 @@ OUString ZipPackageFolderEnumeration::getImplementationName()
return "ZipPackageFolderEnumeration";
}
uno::Sequence< OUString > ZipPackageFolderEnumeration::getSupportedServiceNames()
uno::Sequence<OUString> ZipPackageFolderEnumeration::getSupportedServiceNames()
{
uno::Sequence< OUString > aNames { "com.sun.star.packages.PackageFolderEnumeration" };
uno::Sequence<OUString> aNames{ "com.sun.star.packages.PackageFolderEnumeration" };
return aNames;
}
sal_Bool SAL_CALL ZipPackageFolderEnumeration::supportsService( OUString const & rServiceName )
sal_Bool SAL_CALL ZipPackageFolderEnumeration::supportsService(OUString const& rServiceName)
{
return cppu::supportsService(this, rServiceName);
}

21
package/source/zippackage/ZipPackageFolderEnumeration.hxx
View file

@ -24,28 +24,25 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <HashMaps.hxx>
class ZipPackageFolderEnumeration final : public cppu::WeakImplHelper
<
css::container::XEnumeration,
css::lang::XServiceInfo
>
class ZipPackageFolderEnumeration final
: public cppu::WeakImplHelper<css::container::XEnumeration, css::lang::XServiceInfo>
{
ContentHash& rContents;
ContentHash::const_iterator aIterator;
public:
//ZipPackageFolderEnumeration (unordered_map < OUString, css::uno::Reference < css::container::XNamed >, hashFunc, eqFunc > &rInput);
ZipPackageFolderEnumeration (ContentHash &rInput);
ZipPackageFolderEnumeration(ContentHash& rInput);
virtual ~ZipPackageFolderEnumeration() override;
// XEnumeration
virtual sal_Bool SAL_CALL hasMoreElements( ) override;
virtual css::uno::Any SAL_CALL nextElement( ) override;
virtual sal_Bool SAL_CALL hasMoreElements() override;
virtual css::uno::Any SAL_CALL nextElement() override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName( ) override;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
virtual OUString SAL_CALL getImplementationName() override;
virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
};
#endif

11
package/source/zippackage/ZipPackageSink.cxx
View file

@ -20,17 +20,16 @@
#include "ZipPackageSink.hxx"
ZipPackageSink::ZipPackageSink()
: xStream ( css::uno::Reference < css::io::XInputStream > (nullptr))
: xStream(css::uno::Reference<css::io::XInputStream>(nullptr))
{
}
ZipPackageSink::~ZipPackageSink()
{
}
void SAL_CALL ZipPackageSink::setInputStream( const css::uno::Reference< css::io::XInputStream >& aStream )
ZipPackageSink::~ZipPackageSink() {}
void SAL_CALL
ZipPackageSink::setInputStream(const css::uno::Reference<css::io::XInputStream>& aStream)
{
xStream = aStream;
}
css::uno::Reference< css::io::XInputStream > SAL_CALL ZipPackageSink::getInputStream( )
css::uno::Reference<css::io::XInputStream> SAL_CALL ZipPackageSink::getInputStream()
{
return xStream;
}

10
package/source/zippackage/ZipPackageSink.hxx
View file

@ -22,14 +22,16 @@
#include <com/sun/star/io/XActiveDataSink.hpp>
#include <cppuhelper/implbase.hxx>
class ZipPackageSink final : public ::cppu::WeakImplHelper< css::io::XActiveDataSink >
class ZipPackageSink final : public ::cppu::WeakImplHelper<css::io::XActiveDataSink>
{
css::uno::Reference < css::io::XInputStream > xStream;
css::uno::Reference<css::io::XInputStream> xStream;
public:
ZipPackageSink();
virtual ~ZipPackageSink() override;
virtual void SAL_CALL setInputStream( const css::uno::Reference< css::io::XInputStream >& aStream ) override;
virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream( ) override;
virtual void SAL_CALL
setInputStream(const css::uno::Reference<css::io::XInputStream>& aStream) override;
virtual css::uno::Reference<css::io::XInputStream> SAL_CALL getInputStream() override;
};
#endif

9
solenv/clang-format/excludelist
View file

@ -7905,11 +7905,8 @@ opencl/source/platforminfo.cxx
package/inc/ByteChucker.hxx
package/inc/ByteGrabber.hxx
package/inc/CRC32.hxx
package/inc/EncryptedDataHeader.hxx
package/inc/EncryptionData.hxx
package/inc/HashMaps.hxx
package/inc/PackageConstants.hxx
package/inc/ZipEnumeration.hxx
package/inc/ZipFile.hxx
package/inc/ZipOutputEntry.hxx
package/inc/ZipOutputStream.hxx
@ -7930,7 +7927,6 @@ package/source/manifest/ManifestReader.hxx
package/source/manifest/ManifestWriter.cxx
package/source/manifest/ManifestWriter.hxx
package/source/xstor/disposelistener.cxx
package/source/xstor/disposelistener.hxx
package/source/xstor/ocompinstream.cxx
package/source/xstor/ocompinstream.hxx
package/source/xstor/ohierarchyholder.cxx
@ -7957,7 +7953,6 @@ package/source/zipapi/XBufferedThreadedStream.cxx
package/source/zipapi/XBufferedThreadedStream.hxx
package/source/zipapi/XUnbufferedStream.cxx
package/source/zipapi/XUnbufferedStream.hxx
package/source/zipapi/ZipEnumeration.cxx
package/source/zipapi/ZipFile.cxx
package/source/zipapi/ZipOutputEntry.cxx
package/source/zipapi/ZipOutputStream.cxx
@ -7970,10 +7965,6 @@ package/source/zippackage/ZipPackage.cxx
package/source/zippackage/ZipPackageBuffer.cxx
package/source/zippackage/ZipPackageEntry.cxx
package/source/zippackage/ZipPackageFolder.cxx
package/source/zippackage/ZipPackageFolderEnumeration.cxx
package/source/zippackage/ZipPackageFolderEnumeration.hxx
package/source/zippackage/ZipPackageSink.cxx
package/source/zippackage/ZipPackageSink.hxx
package/source/zippackage/ZipPackageStream.cxx
package/source/zippackage/wrapstreamforshare.cxx
package/source/zippackage/wrapstreamforshare.hxx