diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2021-03-31 19:13:17 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2021-04-02 12:57:35 +0200 |
| commit | 2c64c4ac72ec5ec70ed3ded444f3b1006d116d60 (patch) | |
| tree | f620af6bbf4d5d1d08b33c8444510fa129137aca /include | |
| parent | 24fad8bf168beb56855d97ede2d4a1dec2a46220 (diff) | |
vcl: move MapMode reading and writing to TypeSerializer
remove usage of ReadMapMode and WriteMapMode and add tests
Change-Id: I40e1da8aea5c2171d9dbb6343fbf61912e5b3367
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113498
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/TypeSerializer.hxx | 3 | ||||
| -rw-r--r-- | include/vcl/mapmod.hxx | 12 |
2 files changed, 9 insertions, 6 deletions
diff --git a/include/vcl/TypeSerializer.hxx b/include/vcl/TypeSerializer.hxx index 7be2f54198e7..e85b25b1cfe3 100644 --- a/include/vcl/TypeSerializer.hxx +++ b/include/vcl/TypeSerializer.hxx @@ -50,6 +50,9 @@ public: void readGraphic(Graphic& rGraphic); void writeGraphic(const Graphic& rGraphic); + + void readMapMode(MapMode& rMapMode); + void writeMapMode(MapMode const& rMapMode); }; #endif diff --git a/include/vcl/mapmod.hxx b/include/vcl/mapmod.hxx index e6c96048c90c..9af61f8b7e69 100644 --- a/include/vcl/mapmod.hxx +++ b/include/vcl/mapmod.hxx @@ -59,20 +59,20 @@ public: MapMode& operator=( MapMode&& rMapMode ); bool operator==( const MapMode& rMapMode ) const; bool operator!=( const MapMode& rMapMode ) const - { return !(MapMode::operator==( rMapMode )); } + { + return !(MapMode::operator==( rMapMode )); + } bool IsDefault() const; - friend SvStream& ReadMapMode( SvStream& rIStm, MapMode& rMapMode ); - friend SvStream& WriteMapMode( SvStream& rOStm, const MapMode& rMapMode ); - // tdf#117984 needs to be thread-safe due to being used e.g. in Bitmaps // vcl::ScopedBitmapAccess in parallelized 3D renderer typedef o3tl::cow_wrapper< ImplMapMode, o3tl::ThreadSafeRefCountingPolicy > ImplType; + // If only the map unit is set. + bool IsSimple() const; + private: ImplType mpImplMapMode; - - SAL_DLLPRIVATE bool IsSimple() const; }; template<typename charT, typename traits> |