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

1
package/inc/ZipEnumeration.hxx
View file

@ -25,6 +25,7 @@ class ZipEnumeration final
{
EntryHash& rEntryHash;
EntryHash::const_iterator aIterator;
public:
bool hasMoreElements();
const ZipEntry* nextElement();

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

@ -26,13 +26,8 @@ ZipEnumeration::ZipEnumeration( EntryHash & 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()
{

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

@ -36,9 +36,7 @@ ZipPackageFolderEnumeration::ZipPackageFolderEnumeration ( ContentHash &rInput)
{
}
ZipPackageFolderEnumeration::~ZipPackageFolderEnumeration()
{
}
ZipPackageFolderEnumeration::~ZipPackageFolderEnumeration() {}
sal_Bool SAL_CALL ZipPackageFolderEnumeration::hasMoreElements()
{

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

@ -24,14 +24,12 @@
#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);
@ -45,7 +43,6 @@ public:
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

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

@ -23,10 +23,9 @@ ZipPackageSink::ZipPackageSink()
: 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;
}

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

@ -25,10 +25,12 @@
class ZipPackageSink final : public ::cppu::WeakImplHelper<css::io::XActiveDataSink>
{
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 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