summaryrefslogtreecommitdiff
path: root/include/vcl
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2020-12-27 19:07:57 +0900
committerTomaž Vajngerl <quikee@gmail.com>2021-01-10 23:59:57 +0100
commit80497c7d81af36f703d122ac78baa26387a5854d (patch)
tree79e119b88b6a133564a3a0e605fdd6f40f950e3e /include/vcl
parent070084c4d62bc05d7d9fdd7b4368b91ccd9c1e8b (diff)
vcl: implement BinaryDataContainer copy, move + test
Also remove constructor that takes size only - BinaryDataContainer should always be constructed with data, that is copied into the container and should be immutable. Change-Id: Ic61b393b7729b948843bd20e6676c9290c68936f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108439 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'include/vcl')
-rw-r--r--include/vcl/BinaryDataContainer.hxx26
1 files changed, 21 insertions, 5 deletions
diff --git a/include/vcl/BinaryDataContainer.hxx b/include/vcl/BinaryDataContainer.hxx
index af79f474e3e4..f367b640c063 100644
--- a/include/vcl/BinaryDataContainer.hxx
+++ b/include/vcl/BinaryDataContainer.hxx
@@ -27,13 +27,29 @@ private:
public:
explicit BinaryDataContainer();
- explicit BinaryDataContainer(size_t nSize);
explicit BinaryDataContainer(const sal_uInt8* pData, size_t nSize);
- explicit BinaryDataContainer(const BinaryDataContainer& rBinaryDataContainer) = default;
- explicit BinaryDataContainer(BinaryDataContainer&& rBinaryDataContainer) = default;
- BinaryDataContainer& operator=(const BinaryDataContainer& rBinaryDataContainer) = default;
- BinaryDataContainer& operator=(BinaryDataContainer&& rBinaryDataContainer) = default;
+ BinaryDataContainer(const BinaryDataContainer& rBinaryDataContainer)
+ : mpData(rBinaryDataContainer.mpData)
+ {
+ }
+
+ BinaryDataContainer(BinaryDataContainer&& rBinaryDataContainer)
+ : mpData(std::move(rBinaryDataContainer.mpData))
+ {
+ }
+
+ BinaryDataContainer& operator=(const BinaryDataContainer& rBinaryDataContainer)
+ {
+ mpData = rBinaryDataContainer.mpData;
+ return *this;
+ }
+
+ BinaryDataContainer& operator=(BinaryDataContainer&& rBinaryDataContainer)
+ {
+ mpData = std::move(rBinaryDataContainer.mpData);
+ return *this;
+ }
size_t getSize() const { return mpData ? mpData->size() : 0; }
bool isEmpty() const { return !mpData || mpData->empty(); }