diff options
| author | Noel Grandin <noel@peralex.com> | 2014-12-12 14:32:11 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-12-19 08:50:29 +0200 |
| commit | 4cbba98601ae16cda1739e1e81d697592bb31213 (patch) | |
| tree | e9dab946f962455656c76479ee63c6b41d139dc1 /include/oox | |
| parent | a3181adc11bc707680424551369a24b3c65de921 (diff) | |
remove operator>> and operator<< methods
in favour of ReadXXX/WriteXXX methods
Change-Id: I849fd10c689fb9834ae9974e430dc337adc68755
Diffstat (limited to 'include/oox')
| -rw-r--r-- | include/oox/helper/binaryinputstream.hxx | 18 | ||||
| -rw-r--r-- | include/oox/helper/binaryoutputstream.hxx | 4 |
2 files changed, 13 insertions, 9 deletions
diff --git a/include/oox/helper/binaryinputstream.hxx b/include/oox/helper/binaryinputstream.hxx index 49186054954e..569f48d77642 100644 --- a/include/oox/helper/binaryinputstream.hxx +++ b/include/oox/helper/binaryinputstream.hxx @@ -78,18 +78,30 @@ public: All data types supported by the ByteOrderConverter class can be used. */ template< typename Type > + SAL_WARN_UNUSED_RESULT Type readValue(); + SAL_WARN_UNUSED_RESULT sal_Int8 readInt8() { return readValue<sal_Int8>(); } + SAL_WARN_UNUSED_RESULT sal_uInt8 readuInt8() { return readValue<sal_uInt8>(); } + SAL_WARN_UNUSED_RESULT sal_Int16 readInt16() { return readValue<sal_Int16>(); } + SAL_WARN_UNUSED_RESULT sal_uInt16 readuInt16() { return readValue<sal_uInt16>(); } + SAL_WARN_UNUSED_RESULT sal_Int32 readInt32() { return readValue<sal_Int32>(); } + SAL_WARN_UNUSED_RESULT sal_uInt32 readuInt32() { return readValue<sal_uInt32>(); } + SAL_WARN_UNUSED_RESULT sal_Int64 readInt64() { return readValue<sal_Int64>(); } + SAL_WARN_UNUSED_RESULT sal_uInt64 readuInt64() { return readValue<sal_uInt64>(); } + SAL_WARN_UNUSED_RESULT float readFloat() { return readValue<float>(); } + SAL_WARN_UNUSED_RESULT double readDouble() { return readValue<double>(); } + SAL_WARN_UNUSED_RESULT unsigned char readuChar() { return readValue<unsigned char>(); } /** Reads a (preallocated!) C array of values from the stream. @@ -204,7 +216,7 @@ public: /** Copies nBytes bytes from the current position to the passed output stream. */ - void copyToStream( BinaryOutputStream& rOutStrm, sal_Int64 nBytes = SAL_MAX_INT64, sal_Int32 nAtomSize = 1 ); + void copyToStream( BinaryOutputStream& rOutStrm, sal_Int64 nBytes = SAL_MAX_INT64, sal_Int32 nAtomSize = 1 ); protected: /** This dummy default c'tor will never call the c'tor of the virtual base @@ -300,10 +312,6 @@ public: non-seekable streams too. */ virtual void skip( sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; - /** Stream operator for all data types supported by the readValue() function. */ - template< typename Type > - BinaryXInputStream& operator>>( Type& ornValue ) { ornValue = readValue<Type>(); return *this; } - private: StreamDataSequence maBuffer; ///< Data buffer used in readMemory() function. ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > diff --git a/include/oox/helper/binaryoutputstream.hxx b/include/oox/helper/binaryoutputstream.hxx index 0674481ccdc4..e1c21ff79a13 100644 --- a/include/oox/helper/binaryoutputstream.hxx +++ b/include/oox/helper/binaryoutputstream.hxx @@ -155,10 +155,6 @@ public: /** Write nBytes bytes from the (preallocated!) buffer pMem. */ virtual void writeMemory( const void* pMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; - /** Stream operator for all data types supported by the writeValue() function. */ - template< typename Type > - BinaryXOutputStream& operator<<( Type nValue ) { writeValue( nValue ); return *this; } - /** Returns the XOutputStream interface of the wrapped output stream. */ ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > getXOutputStream() const { return mxOutStrm; } |