diff options
Diffstat (limited to 'include/oox')
-rw-r--r-- | include/oox/crypto/CryptTools.hxx | 3 | ||||
-rw-r--r-- | include/oox/drawingml/chart/modelbase.hxx | 2 | ||||
-rw-r--r-- | include/oox/helper/binaryinputstream.hxx | 39 |
3 files changed, 0 insertions, 44 deletions
diff --git a/include/oox/crypto/CryptTools.hxx b/include/oox/crypto/CryptTools.hxx index 86bfb79fa2d3..c1602af7c25b 100644 --- a/include/oox/crypto/CryptTools.hxx +++ b/include/oox/crypto/CryptTools.hxx @@ -154,9 +154,6 @@ public: static bool sha512(std::vector<sal_uInt8>& digest, std::vector<sal_uInt8>& input); }; -bool sha1( std::vector<sal_uInt8>& digest, std::vector<sal_uInt8>& input); -bool sha512(std::vector<sal_uInt8>& digest, std::vector<sal_uInt8>& input); - } // namespace core } // namespace oox diff --git a/include/oox/drawingml/chart/modelbase.hxx b/include/oox/drawingml/chart/modelbase.hxx index 0d01fc4d19b1..5dc25fb8c1d1 100644 --- a/include/oox/drawingml/chart/modelbase.hxx +++ b/include/oox/drawingml/chart/modelbase.hxx @@ -83,8 +83,6 @@ public: ~ModelMap() {} ModelType& create( KeyType eKey ) { return insert( eKey, new ModelType ); } - template< typename Param1Type > - ModelType& create( KeyType eKey, const Param1Type& rParam1 ) { return insert( eKey, new ModelType( rParam1 ) ); } private: ModelType& insert( KeyType eKey, ModelType* pModel ) { (*this)[ eKey ].reset( pModel ); return *pModel; } diff --git a/include/oox/helper/binaryinputstream.hxx b/include/oox/helper/binaryinputstream.hxx index 423af9c77ab4..36edfe351e38 100644 --- a/include/oox/helper/binaryinputstream.hxx +++ b/include/oox/helper/binaryinputstream.hxx @@ -116,21 +116,6 @@ public: template< typename Type > sal_Int32 readArray( Type* opnArray, sal_Int32 nElemCount ); - /** Reads a sequence of values from the stream. - - The sequence will be reallocated internally. Converts all values in the - array to platform byte order. All data types supported by the - ByteOrderConverter class can be used. - - @param nElemCount - Number of elements to put into the sequence (NOT byte count). - - @return - Number of sequence elements really read (NOT byte count). - */ - template< typename Type > - sal_Int32 readArray( ::com::sun::star::uno::Sequence< Type >& orSequence, sal_Int32 nElemCount ); - /** Reads a vector of values from the stream. The vector will be resized internally. Converts all values in the @@ -146,16 +131,6 @@ public: template< typename Type > sal_Int32 readArray( ::std::vector< Type >& orVector, sal_Int32 nElemCount ); - /** Skips an array of values of a certain type in the stream. - - All data types supported by the ByteOrderConverter class can be used. - - @param nElemCount - Number of array elements to skip (NOT byte count). - */ - template< typename Type > - void skipArray( sal_Int32 nElemCount ); - /** Reads a NUL-terminated Unicode character array and returns the string. */ OUString readNulUnicodeArray(); @@ -253,26 +228,12 @@ sal_Int32 BinaryInputStream::readArray( Type* opnArray, sal_Int32 nElemCount ) } template< typename Type > -sal_Int32 BinaryInputStream::readArray( ::com::sun::star::uno::Sequence< Type >& orSequence, sal_Int32 nElemCount ) -{ - orSequence.reallocate( nElemCount ); - return orSequence.hasElements() ? readArray( orSequence.getArray(), nElemCount ) : 0; -} - -template< typename Type > sal_Int32 BinaryInputStream::readArray( ::std::vector< Type >& orVector, sal_Int32 nElemCount ) { orVector.resize( static_cast< size_t >( nElemCount ) ); return orVector.empty() ? 0 : readArray( &orVector.front(), nElemCount ); } -template< typename Type > -void BinaryInputStream::skipArray( sal_Int32 nElemCount ) -{ - sal_Int32 nSkipSize = getLimitedValue< sal_Int32, sal_Int32 >( nElemCount, 0, SAL_MAX_INT32 / sizeof( Type ) ) * sizeof( Type ); - skip( nSkipSize, sizeof( Type ) ); -} - /** Wraps a UNO input stream and provides convenient access functions. |