[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - include/vcl vcl/source

[Michael Meeks (via logerrit)]

 include/vcl/BinaryDataContainer.hxx        |    2 +-
 vcl/source/graphic/BinaryDataContainer.cxx |   25 ++++++++-----------------
 2 files changed, 9 insertions(+), 18 deletions(-)

New commits:
commit e435da0b59789f2396ab7eac4d93aa255b02a730
Author:     Michael Meeks <michael.me...@collabora.com>
AuthorDate: Sat Apr 1 21:17:15 2023 +0100
Commit:     Michael Meeks <michael.me...@collabora.com>
CommitDate: Sat Apr 8 11:13:59 2023 +0200

    clang-format noise to make porting to/from master easier.
    
    Change-Id: Id2721719ff4e7713892b0b6c549b455382eca8ac
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150118
    Tested-by: Michael Meeks <michael.me...@collabora.com>
    Reviewed-by: Michael Meeks <michael.me...@collabora.com>

diff --git a/include/vcl/BinaryDataContainer.hxx 
b/include/vcl/BinaryDataContainer.hxx
index 78cb52d05f8a..3e5b4395a61a 100644
--- a/include/vcl/BinaryDataContainer.hxx
+++ b/include/vcl/BinaryDataContainer.hxx
@@ -51,7 +51,7 @@ public:
     std::shared_ptr<SvStream> getAsStream();
 
     /// writes the contents to the given stream
-    std::size_t writeToStream(SvStream &rStream) const;
+    std::size_t writeToStream(SvStream& rStream) const;
 
     size_t calculateHash() const;
 };
diff --git a/vcl/source/graphic/BinaryDataContainer.cxx 
b/vcl/source/graphic/BinaryDataContainer.cxx
index c0992421223f..0eaaa75e380c 100644
--- a/vcl/source/graphic/BinaryDataContainer.cxx
+++ b/vcl/source/graphic/BinaryDataContainer.cxx
@@ -46,10 +46,11 @@ css::uno::Sequence<sal_Int8> 
BinaryDataContainer::getAsSequence() const
 class ReferencedMemoryStream : public SvMemoryStream
 {
     std::shared_ptr<std::vector<sal_uInt8>> mpData;
+
 public:
-    ReferencedMemoryStream(const std::shared_ptr<std::vector<sal_uInt8>> 
&rData)
-        : SvMemoryStream(rData ? rData->data() : nullptr, rData->size(), 
StreamMode::READ),
-          mpData(rData)
+    ReferencedMemoryStream(const std::shared_ptr<std::vector<sal_uInt8>>& 
rData)
+        : SvMemoryStream(rData ? rData->data() : nullptr, rData->size(), 
StreamMode::READ)
+        , mpData(rData)
     {
     }
 };
@@ -59,25 +60,15 @@ std::shared_ptr<SvStream> BinaryDataContainer::getAsStream()
     return std::make_shared<ReferencedMemoryStream>(mpData);
 }
 
-std::size_t BinaryDataContainer::writeToStream(SvStream &rStream) const
+std::size_t BinaryDataContainer::writeToStream(SvStream& rStream) const
 {
     return rStream.WriteBytes(getData(), getSize());
 }
 
-size_t BinaryDataContainer::getSize() const
-{
-    return mpData ? mpData->size() : 0;
-}
-
-bool BinaryDataContainer::isEmpty() const
-{
-    return !mpData || mpData->empty();
-}
+size_t BinaryDataContainer::getSize() const { return mpData ? mpData->size() : 
0; }
 
-const sal_uInt8* BinaryDataContainer::getData() const
-{
-    return mpData ? mpData->data() : nullptr;
-}
+bool BinaryDataContainer::isEmpty() const { return !mpData || mpData->empty(); 
}
 
+const sal_uInt8* BinaryDataContainer::getData() const { return mpData ? 
mpData->data() : nullptr; }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */