remove operator>> and operator<< methods

in favour of ReadXXX/WriteXXX methods

Change-Id: I75fcb04cb9e2981a10146a96de27916ca7f6bc57

4 files changed, 2 insertions, 21 deletions

diff --git a/include/oox/helper/binaryinputstream.hxx b/include/oox/helper/binaryinputstream.hxx
index 569f48d77642..0c876ecadbef 100644
--- a/include/oox/helper/binaryinputstream.hxx
+++ b/include/oox/helper/binaryinputstream.hxx
@@ -349,10 +349,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 >
-    SequenceInputStream& operator>>( Type& ornValue ) { ornValue = readValue<Type>(); return *this; }
-
 private:
     /** Returns the number of bytes available in the sequence for the passed byte count. */
     sal_Int32    getMaxBytes( sal_Int32 nBytes ) const
@@ -414,10 +410,6 @@ public:
         non-seekable streams too. Does not seek out of the data block. */
     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 >
-    RelativeInputStream& operator>>( Type& ornValue ) { readValue( ornValue ); return *this; }
-
 private:
     /** Returns the number of bytes available in the sequence for the passed byte count. */
     sal_Int32    getMaxBytes( sal_Int32 nBytes ) const
diff --git a/include/oox/helper/binaryoutputstream.hxx b/include/oox/helper/binaryoutputstream.hxx
index e1c21ff79a13..a1b562133c61 100644
--- a/include/oox/helper/binaryoutputstream.hxx
+++ b/include/oox/helper/binaryoutputstream.hxx
@@ -191,10 +191,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 >
-    SequenceOutputStream& operator<<( Type nValue ) { writeValue( nValue ); return *this; }
 };
 
 
diff --git a/include/oox/ole/axbinaryreader.hxx b/include/oox/ole/axbinaryreader.hxx
index 116d809a25f4..d10d8abbe0de 100644
--- a/include/oox/ole/axbinaryreader.hxx
+++ b/include/oox/ole/axbinaryreader.hxx
@@ -68,12 +68,9 @@ public:
         position of the wrapped stream at construction time). */
     void                align( size_t nSize );
 
-    /** Stream operator for all data types supported by the readValue() function. */
-    template< typename Type >
-    AxAlignedInputStream& operator>>( Type& ornValue ) { ornValue = readValue<Type>(); return *this; }
-
     /** Aligns the stream according to the passed type and reads a value. */
     template< typename Type >
+    SAL_WARN_UNUSED_RESULT
     Type                readAligned() { align( sizeof( Type ) ); return readValue< Type >(); }
     /** Aligns the stream according to the passed type and skips the size of the type. */
     template< typename Type >
@@ -105,7 +102,7 @@ public:
     /** Reads the next integer property value from the stream, if the
         respective flag in the property mask is set. */
     template< typename StreamType, typename DataType >
-    void         readIntProperty( DataType& ornValue )
+    void                readIntProperty( DataType& ornValue )
                             { if( startNextProperty() ) ornValue = maInStrm.readAligned< StreamType >(); }
     /** Reads the next boolean property value from the stream, if the
         respective flag in the property mask is set. */
diff --git a/include/oox/ole/axbinarywriter.hxx b/include/oox/ole/axbinarywriter.hxx
index 05d6c60bc7b9..d380ab7223d1 100644
--- a/include/oox/ole/axbinarywriter.hxx
+++ b/include/oox/ole/axbinarywriter.hxx
@@ -56,10 +56,6 @@ public:
 
     void         pad( sal_Int32 nBytes, size_t nAtomSize = 1);
 
-    /** Stream operator for all data types supported by the writeValue() function. */
-    template< typename Type >
-    AxAlignedOutputStream& operator<<( Type nValue ) { writeValue( nValue ); return *this; }
-
     /** Aligns the stream according to the passed type and reads a value. */
     template< typename Type >
     void         writeAligned( Type nVal ) { align( sizeof( Type ) ); writeValue( nVal ); }