diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2019-09-26 16:22:09 +0200 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2019-09-29 15:17:47 +0200 |
| commit | 66eedce71f10c30712f34732157e4dcdfcb49090 (patch) | |
| tree | 912ca181175c8bde690eda218d4051a4604bbcff /include | |
| parent | 43d3f3a2d1f5a3dcfbd42368c4e86e24b80c6cbb (diff) | |
Move Rectangle,Point,Size serialization to GenericTypeSerializer
Change-Id: Iae489fc31b13b836e1df5327ba2fa07e0325907a
Reviewed-on: https://gerrit.libreoffice.org/79793
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/tools/GenericTypeSerializer.hxx | 10 | ||||
| -rw-r--r-- | include/tools/gen.hxx | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/include/tools/GenericTypeSerializer.hxx b/include/tools/GenericTypeSerializer.hxx index 92f2bdfb169b..cb54e693c118 100644 --- a/include/tools/GenericTypeSerializer.hxx +++ b/include/tools/GenericTypeSerializer.hxx @@ -21,6 +21,7 @@ #include <tools/toolsdllapi.h> #include <tools/color.hxx> +#include <tools/gen.hxx> #include <tools/stream.hxx> namespace tools @@ -37,6 +38,15 @@ public: void readColor(Color& rColor); void writeColor(const Color& rColor); + + void readPoint(Point& rPoint); + void writePoint(const Point& rPoint); + + void readSize(Size& rSize); + void writeSize(const Size& rSize); + + void readRectangle(Rectangle& rRectangle); + void writeRectangle(const Rectangle& rRectangle); }; } // end namespace tools diff --git a/include/tools/gen.hxx b/include/tools/gen.hxx index b8ee06c8031e..2603070589e8 100644 --- a/include/tools/gen.hxx +++ b/include/tools/gen.hxx @@ -48,8 +48,6 @@ public: long& B() { return nB; } TOOLS_DLLPUBLIC rtl::OString toString() const; - TOOLS_DLLPUBLIC friend SvStream& ReadPair( SvStream& rIStream, Pair& rPair ); - TOOLS_DLLPUBLIC friend SvStream& WritePair( SvStream& rOStream, const Pair& rPair ); protected: long nA; @@ -448,9 +446,6 @@ public: friend inline tools::Rectangle operator + ( const tools::Rectangle& rRect, const Point& rPt ); friend inline tools::Rectangle operator - ( const tools::Rectangle& rRect, const Point& rPt ); - TOOLS_DLLPUBLIC friend SvStream& ReadRectangle( SvStream& rIStream, tools::Rectangle& rRect ); - TOOLS_DLLPUBLIC friend SvStream& WriteRectangle( SvStream& rOStream, const tools::Rectangle& rRect ); - // ONE long getX() const { return nLeft; } long getY() const { return nTop; } @@ -733,11 +728,6 @@ inline std::basic_ostream<charT, traits> & operator <<( << "@(" << rectangle.getX() << ',' << rectangle.getY() << ")"; } -inline SvStream& ReadPair( SvStream& rIStream, Point& v ) { return ReadPair(rIStream, v.toPair()); } -inline SvStream& WritePair( SvStream& rOStream, const Point& v ) { return WritePair(rOStream, v.toPair()); } -inline SvStream& ReadPair( SvStream& rIStream, Size& v ) { return ReadPair(rIStream, v.toPair()); } -inline SvStream& WritePair( SvStream& rOStream, const Size& v ) { return WritePair(rOStream, v.toPair()); } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |