summaryrefslogtreecommitdiff
path: root/include/oox/helper
diff options
context:
space:
mode:
Diffstat (limited to 'include/oox/helper')
-rw-r--r--include/oox/helper/binaryinputstream.hxx28
-rw-r--r--include/oox/helper/binaryoutputstream.hxx10
-rw-r--r--include/oox/helper/binarystreambase.hxx16
-rw-r--r--include/oox/helper/progressbar.hxx12
-rw-r--r--include/oox/helper/zipstorage.hxx14
5 files changed, 40 insertions, 40 deletions
diff --git a/include/oox/helper/binaryinputstream.hxx b/include/oox/helper/binaryinputstream.hxx
index 36edfe351e38..af4cf4a3c8af 100644
--- a/include/oox/helper/binaryinputstream.hxx
+++ b/include/oox/helper/binaryinputstream.hxx
@@ -261,19 +261,19 @@ public:
/** Closes the input stream. Does also close the wrapped UNO input stream
if bAutoClose has been set to true in the constructor. */
- virtual void close() SAL_OVERRIDE;
+ virtual void close() override;
/** Reads nBytes bytes to the passed sequence.
@return Number of bytes really read. */
- virtual sal_Int32 readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE;
+ virtual sal_Int32 readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 ) override;
/** Reads nBytes bytes to the (existing) buffer opMem.
@return Number of bytes really read. */
- virtual sal_Int32 readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE;
+ virtual sal_Int32 readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) override;
/** Seeks the stream forward by the passed number of bytes. This works for
non-seekable streams too. */
- virtual void skip( sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE;
+ virtual void skip( sal_Int32 nBytes, size_t nAtomSize = 1 ) override;
private:
StreamDataSequence maBuffer; ///< Data buffer used in readMemory() function.
@@ -302,15 +302,15 @@ public:
/** Reads nBytes bytes to the passed sequence.
@return Number of bytes really read. */
- virtual sal_Int32 readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE;
+ virtual sal_Int32 readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 ) override;
/** Reads nBytes bytes to the (existing) buffer opMem.
@return Number of bytes really read. */
- virtual sal_Int32 readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE;
+ virtual sal_Int32 readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) override;
/** Seeks the stream forward by the passed number of bytes. This works for
non-seekable streams too. */
- virtual void skip( sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE;
+ virtual void skip( sal_Int32 nBytes, size_t nAtomSize = 1 ) override;
private:
/** Returns the number of bytes available in the sequence for the passed byte count. */
@@ -347,31 +347,31 @@ public:
/** Returns the size of the data block in the wrapped stream offered by
this wrapper. */
- virtual sal_Int64 size() const SAL_OVERRIDE;
+ virtual sal_Int64 size() const override;
/** Returns the current relative stream position. */
- virtual sal_Int64 tell() const SAL_OVERRIDE;
+ virtual sal_Int64 tell() const override;
/** Seeks the stream to the passed relative position, if the wrapped stream
is seekable. */
- virtual void seek( sal_Int64 nPos ) SAL_OVERRIDE;
+ virtual void seek( sal_Int64 nPos ) override;
/** Closes the input stream but not the wrapped stream. */
- virtual void close() SAL_OVERRIDE;
+ virtual void close() override;
/** Reads nBytes bytes to the passed sequence. Does not read out of the
data block whose size has been specified on construction.
@return Number of bytes really read. */
- virtual sal_Int32 readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE;
+ virtual sal_Int32 readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 ) override;
/** Reads nBytes bytes to the (existing) buffer opMem. Does not read out of
the data block whose size has been specified on construction.
@return Number of bytes really read. */
- virtual sal_Int32 readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE;
+ virtual sal_Int32 readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) override;
/** Seeks the stream forward by the passed number of bytes. This works for
non-seekable streams too. Does not seek out of the data block. */
- virtual void skip( sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE;
+ virtual void skip( sal_Int32 nBytes, size_t nAtomSize = 1 ) override;
private:
/** Returns the number of bytes available in the sequence for the passed byte count. */
diff --git a/include/oox/helper/binaryoutputstream.hxx b/include/oox/helper/binaryoutputstream.hxx
index bcceec379ffa..ac17f292226e 100644
--- a/include/oox/helper/binaryoutputstream.hxx
+++ b/include/oox/helper/binaryoutputstream.hxx
@@ -140,13 +140,13 @@ public:
/** Flushes and closes the output stream. Does also close the wrapped UNO
output stream if bAutoClose has been set to true in the constructor. */
- void close() SAL_OVERRIDE;
+ void close() override;
/** Writes the passed data sequence. */
- virtual void writeData( const StreamDataSequence& rData, size_t nAtomSize = 1 ) SAL_OVERRIDE;
+ virtual void writeData( const StreamDataSequence& rData, size_t nAtomSize = 1 ) override;
/** Write nBytes bytes from the (preallocated!) buffer pMem. */
- virtual void writeMemory( const void* pMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE;
+ virtual void writeMemory( const void* pMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) override;
private:
StreamDataSequence maBuffer; ///< Data buffer used in writeMemory() function.
@@ -176,10 +176,10 @@ public:
explicit SequenceOutputStream( StreamDataSequence& rData );
/** Writes the passed data sequence. */
- virtual void writeData( const StreamDataSequence& rData, size_t nAtomSize = 1 ) SAL_OVERRIDE;
+ virtual void writeData( const StreamDataSequence& rData, size_t nAtomSize = 1 ) override;
/** Write nBytes bytes from the (preallocated!) buffer pMem. */
- virtual void writeMemory( const void* pMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE;
+ virtual void writeMemory( const void* pMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) override;
};
diff --git a/include/oox/helper/binarystreambase.hxx b/include/oox/helper/binarystreambase.hxx
index 4078fc68f5ac..38a9d67e3c9c 100644
--- a/include/oox/helper/binarystreambase.hxx
+++ b/include/oox/helper/binarystreambase.hxx
@@ -128,13 +128,13 @@ public:
virtual ~BinaryXSeekableStream();
/** Returns the size of the stream, if wrapped stream is seekable, otherwise -1. */
- virtual sal_Int64 size() const SAL_OVERRIDE;
+ virtual sal_Int64 size() const override;
/** Returns the current stream position, if wrapped stream is seekable, otherwise -1. */
- virtual sal_Int64 tell() const SAL_OVERRIDE;
+ virtual sal_Int64 tell() const override;
/** Seeks the stream to the passed position, if wrapped stream is seekable. */
- virtual void seek( sal_Int64 nPos ) SAL_OVERRIDE;
+ virtual void seek( sal_Int64 nPos ) override;
/** Releases the reference to the UNO XSeekable interface. */
- virtual void close() SAL_OVERRIDE;
+ virtual void close() override;
protected:
explicit BinaryXSeekableStream(
@@ -158,13 +158,13 @@ class OOX_DLLPUBLIC SequenceSeekableStream : public virtual BinaryStreamBase
{
public:
/** Returns the size of the wrapped data sequence. */
- virtual sal_Int64 size() const SAL_OVERRIDE;
+ virtual sal_Int64 size() const override;
/** Returns the current stream position. */
- virtual sal_Int64 tell() const SAL_OVERRIDE;
+ virtual sal_Int64 tell() const override;
/** Seeks the stream to the passed position. */
- virtual void seek( sal_Int64 nPos ) SAL_OVERRIDE;
+ virtual void seek( sal_Int64 nPos ) override;
/** Releases the reference to the data sequence. */
- virtual void close() SAL_OVERRIDE;
+ virtual void close() override;
protected:
explicit SequenceSeekableStream( const StreamDataSequence& rData );
diff --git a/include/oox/helper/progressbar.hxx b/include/oox/helper/progressbar.hxx
index da998010f591..02e0dcead04b 100644
--- a/include/oox/helper/progressbar.hxx
+++ b/include/oox/helper/progressbar.hxx
@@ -92,9 +92,9 @@ public:
virtual ~ProgressBar();
/** Returns the current position of the progress bar. */
- virtual double getPosition() const SAL_OVERRIDE;
+ virtual double getPosition() const override;
/** Sets the current position of the progress bar. */
- virtual void setPosition( double fPosition ) SAL_OVERRIDE;
+ virtual void setPosition( double fPosition ) override;
private:
::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator >
@@ -114,14 +114,14 @@ public:
const OUString& rText );
/** Returns the current position of the progress bar segment. */
- virtual double getPosition() const SAL_OVERRIDE;
+ virtual double getPosition() const override;
/** Sets the current position of the progress bar segment. */
- virtual void setPosition( double fPosition ) SAL_OVERRIDE;
+ virtual void setPosition( double fPosition ) override;
/** Returns the length that is still free for creating sub segments. */
- virtual double getFreeLength() const SAL_OVERRIDE;
+ virtual double getFreeLength() const override;
/** Adds a new segment with the specified length. */
- virtual ISegmentProgressBarRef createSegment( double fLength ) SAL_OVERRIDE;
+ virtual ISegmentProgressBarRef createSegment( double fLength ) override;
private:
ProgressBar maProgress;
diff --git a/include/oox/helper/zipstorage.hxx b/include/oox/helper/zipstorage.hxx
index f643935bb006..baf8d1241752 100644
--- a/include/oox/helper/zipstorage.hxx
+++ b/include/oox/helper/zipstorage.hxx
@@ -51,28 +51,28 @@ private:
const OUString& rElementName );
/** Returns true, if the object represents a valid storage. */
- virtual bool implIsStorage() const SAL_OVERRIDE;
+ virtual bool implIsStorage() const override;
/** Returns the com.sun.star.embed.XStorage interface of the current storage. */
virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >
- implGetXStorage() const SAL_OVERRIDE;
+ implGetXStorage() const override;
/** Returns the names of all elements of this storage. */
- virtual void implGetElementNames( ::std::vector< OUString >& orElementNames ) const SAL_OVERRIDE;
+ virtual void implGetElementNames( ::std::vector< OUString >& orElementNames ) const override;
/** Opens and returns the specified sub storage from the storage. */
- virtual StorageRef implOpenSubStorage( const OUString& rElementName, bool bCreateMissing ) SAL_OVERRIDE;
+ virtual StorageRef implOpenSubStorage( const OUString& rElementName, bool bCreateMissing ) override;
/** Opens and returns the specified input stream from the storage. */
virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
- implOpenInputStream( const OUString& rElementName ) SAL_OVERRIDE;
+ implOpenInputStream( const OUString& rElementName ) override;
/** Opens and returns the specified output stream from the storage. */
virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
- implOpenOutputStream( const OUString& rElementName ) SAL_OVERRIDE;
+ implOpenOutputStream( const OUString& rElementName ) override;
/** Commits the current storage. */
- virtual void implCommit() const SAL_OVERRIDE;
+ virtual void implCommit() const override;
private:
::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >
generated by cgit (git 2.34.1) at 2024-06-14 00:05:20 +0000