summaryrefslogtreecommitdiff
path: root/sot
diff options
context:
space:
mode:
Diffstat (limited to 'sot')
-rw-r--r--sot/qa/cppunit/test_sot.cxx2
-rw-r--r--sot/source/sdstor/stgdir.hxx4
-rw-r--r--sot/source/sdstor/stgole.hxx8
-rw-r--r--sot/source/sdstor/stgstrms.hxx26
-rw-r--r--sot/source/sdstor/ucbstorage.cxx28
-rw-r--r--sot/source/unoolestorage/xolesimplestorage.hxx40
6 files changed, 54 insertions, 54 deletions
diff --git a/sot/qa/cppunit/test_sot.cxx b/sot/qa/cppunit/test_sot.cxx
index 804005a40bdf..52ed35046cf9 100644
--- a/sot/qa/cppunit/test_sot.cxx
+++ b/sot/qa/cppunit/test_sot.cxx
@@ -33,7 +33,7 @@ namespace
virtual bool load(const OUString &,
const OUString &rURL, const OUString &,
- SfxFilterFlags, SotClipboardFormatId, unsigned int) SAL_OVERRIDE;
+ SfxFilterFlags, SotClipboardFormatId, unsigned int) override;
void test();
void testSize();
diff --git a/sot/source/sdstor/stgdir.hxx b/sot/source/sdstor/stgdir.hxx
index 25c854d021e7..7878de384107 100644
--- a/sot/source/sdstor/stgdir.hxx
+++ b/sot/source/sdstor/stgdir.hxx
@@ -48,7 +48,7 @@ class StgDirEntry : public StgAvlNode
bool m_bRemoved; // removed per Invalidate()
bool m_bRenamed; // renamed
void InitMembers(); // ctor helper
- virtual short Compare( const StgAvlNode* ) const SAL_OVERRIDE;
+ virtual short Compare( const StgAvlNode* ) const override;
bool StoreStream( StgIo& ); // store the stream
bool StoreStreams( StgIo& ); // store all streams
void RevertAll(); // revert the whole tree
@@ -97,7 +97,7 @@ class StgDirStrm : public StgDataStrm
public:
explicit StgDirStrm( StgIo& );
virtual ~StgDirStrm();
- virtual bool SetSize( sal_Int32 ) SAL_OVERRIDE; // change the size
+ virtual bool SetSize( sal_Int32 ) override; // change the size
bool Store();
void* GetEntry( sal_Int32 n, bool=false );// get an entry
StgDirEntry* GetRoot() { return m_pRoot; }
diff --git a/sot/source/sdstor/stgole.hxx b/sot/source/sdstor/stgole.hxx
index b1c2db502306..723e3d788e27 100644
--- a/sot/source/sdstor/stgole.hxx
+++ b/sot/source/sdstor/stgole.hxx
@@ -28,10 +28,10 @@
class StgInternalStream : public SvStream
{
BaseStorageStream* m_pStrm;
- virtual sal_uLong GetData( void* pData, sal_uLong nSize ) SAL_OVERRIDE;
- virtual sal_uLong PutData( const void* pData, sal_uLong nSize ) SAL_OVERRIDE;
- virtual sal_uInt64 SeekPos( sal_uInt64 nPos ) SAL_OVERRIDE;
- virtual void FlushData() SAL_OVERRIDE;
+ virtual sal_uLong GetData( void* pData, sal_uLong nSize ) override;
+ virtual sal_uLong PutData( const void* pData, sal_uLong nSize ) override;
+ virtual sal_uInt64 SeekPos( sal_uInt64 nPos ) override;
+ virtual void FlushData() override;
public:
StgInternalStream( BaseStorage&, const OUString&, bool );
virtual ~StgInternalStream();
diff --git a/sot/source/sdstor/stgstrms.hxx b/sot/source/sdstor/stgstrms.hxx
index 42e7dffc8dd8..9bcacb66acab 100644
--- a/sot/source/sdstor/stgstrms.hxx
+++ b/sot/source/sdstor/stgstrms.hxx
@@ -96,14 +96,14 @@ public:
// FAT allocator.
class StgFATStrm : public StgStrm { // the master FAT stream
- virtual bool Pos2Page( sal_Int32 nBytePos ) SAL_OVERRIDE;
+ virtual bool Pos2Page( sal_Int32 nBytePos ) override;
bool SetPage( short, sal_Int32 );
public:
explicit StgFATStrm( StgIo& );
virtual ~StgFATStrm() {}
using StgStrm::GetPage;
sal_Int32 GetPage( short, bool, sal_uInt16 *pnMasterAlloc = 0);
- virtual bool SetSize( sal_Int32 ) SAL_OVERRIDE;
+ virtual bool SetSize( sal_Int32 ) override;
};
// The stream has a size increment which normally is 1, but which can be
@@ -118,9 +118,9 @@ public:
StgDataStrm( StgIo&, StgDirEntry& );
void* GetPtr( sal_Int32 nPos, bool bForce, bool bDirty );
void SetIncrement( short n ) { m_nIncr = n ; }
- virtual bool SetSize( sal_Int32 ) SAL_OVERRIDE;
- virtual sal_Int32 Read( void*, sal_Int32 ) SAL_OVERRIDE;
- virtual sal_Int32 Write( const void*, sal_Int32 ) SAL_OVERRIDE;
+ virtual bool SetSize( sal_Int32 ) override;
+ virtual sal_Int32 Read( void*, sal_Int32 ) override;
+ virtual sal_Int32 Write( const void*, sal_Int32 ) override;
};
// The small stream class provides access to streams with a size < 4096 bytes.
@@ -135,9 +135,9 @@ class StgSmallStrm : public StgStrm // a logical data stream
public:
StgSmallStrm( StgIo&, sal_Int32 nBgn, sal_Int32 nLen );
StgSmallStrm( StgIo&, StgDirEntry& );
- virtual sal_Int32 Read( void*, sal_Int32 ) SAL_OVERRIDE;
- virtual sal_Int32 Write( const void*, sal_Int32 ) SAL_OVERRIDE;
- virtual bool IsSmallStrm() const SAL_OVERRIDE { return true; }
+ virtual sal_Int32 Read( void*, sal_Int32 ) override;
+ virtual sal_Int32 Write( const void*, sal_Int32 ) override;
+ virtual bool IsSmallStrm() const override { return true; }
};
class StgTmpStrm : public SvMemoryStream
@@ -145,16 +145,16 @@ class StgTmpStrm : public SvMemoryStream
OUString m_aName;
SvFileStream* m_pStrm;
using SvMemoryStream::GetData;
- virtual sal_uLong GetData( void* pData, sal_uLong nSize ) SAL_OVERRIDE;
- virtual sal_uLong PutData( const void* pData, sal_uLong nSize ) SAL_OVERRIDE;
- virtual sal_uInt64 SeekPos( sal_uInt64 nPos ) SAL_OVERRIDE;
- virtual void FlushData() SAL_OVERRIDE;
+ virtual sal_uLong GetData( void* pData, sal_uLong nSize ) override;
+ virtual sal_uLong PutData( const void* pData, sal_uLong nSize ) override;
+ virtual sal_uInt64 SeekPos( sal_uInt64 nPos ) override;
+ virtual void FlushData() override;
public:
explicit StgTmpStrm( sal_uLong=16 );
virtual ~StgTmpStrm();
bool Copy( StgTmpStrm& );
- virtual void SetSize( sal_uInt64 ) SAL_OVERRIDE;
+ virtual void SetSize( sal_uInt64 ) override;
sal_uLong GetSize() const;
};
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index f85c87d38079..b2b5efc8e62a 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -92,14 +92,14 @@ public:
explicit FileStreamWrapper_Impl(const OUString& rName);
virtual ~FileStreamWrapper_Impl();
- virtual void SAL_CALL seek( sal_Int64 _nLocation ) throw ( IllegalArgumentException, IOException, RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Int64 SAL_CALL getPosition( ) throw ( IOException, RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Int64 SAL_CALL getLength( ) throw ( IOException, RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual sal_Int32 SAL_CALL readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) throw( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Int32 SAL_CALL available() throw( NotConnectedException, RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual void SAL_CALL closeInput() throw( NotConnectedException, RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL seek( sal_Int64 _nLocation ) throw ( IllegalArgumentException, IOException, RuntimeException, std::exception) override;
+ virtual sal_Int64 SAL_CALL getPosition( ) throw ( IOException, RuntimeException, std::exception) override;
+ virtual sal_Int64 SAL_CALL getLength( ) throw ( IOException, RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception ) override;
+ virtual sal_Int32 SAL_CALL readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception ) override;
+ virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) throw( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL available() throw( NotConnectedException, RuntimeException, std::exception ) override;
+ virtual void SAL_CALL closeInput() throw( NotConnectedException, RuntimeException, std::exception ) override;
protected:
void checkConnected();
@@ -407,12 +407,12 @@ class UCBStorageStream_Impl : public SvRefBase, public SvStream
virtual ~UCBStorageStream_Impl();
public:
- virtual sal_uLong GetData( void* pData, sal_uLong nSize ) SAL_OVERRIDE;
- virtual sal_uLong PutData( const void* pData, sal_uLong nSize ) SAL_OVERRIDE;
- virtual sal_uInt64 SeekPos( sal_uInt64 nPos ) SAL_OVERRIDE;
- virtual void SetSize( sal_uInt64 nSize ) SAL_OVERRIDE;
- virtual void FlushData() SAL_OVERRIDE;
- virtual void ResetError() SAL_OVERRIDE;
+ virtual sal_uLong GetData( void* pData, sal_uLong nSize ) override;
+ virtual sal_uLong PutData( const void* pData, sal_uLong nSize ) override;
+ virtual sal_uInt64 SeekPos( sal_uInt64 nPos ) override;
+ virtual void SetSize( sal_uInt64 nSize ) override;
+ virtual void FlushData() override;
+ virtual void ResetError() override;
UCBStorageStream* m_pAntiImpl; // only valid if an external reference exists
diff --git a/sot/source/unoolestorage/xolesimplestorage.hxx b/sot/source/unoolestorage/xolesimplestorage.hxx
index 03593c7d93ec..5283cd2a1dab 100644
--- a/sot/source/unoolestorage/xolesimplestorage.hxx
+++ b/sot/source/unoolestorage/xolesimplestorage.hxx
@@ -84,7 +84,7 @@ public:
virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
throw ( ::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ ::com::sun::star::uno::RuntimeException, std::exception) override;
// XNameContainer
@@ -94,50 +94,50 @@ public:
throw ( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::container::ElementExistException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeByName( const OUString& Name )
throw ( ::com::sun::star::container::NoSuchElementException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement )
throw ( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::container::NoSuchElementException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName )
throw ( ::com::sun::star::container::NoSuchElementException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ ::com::sun::star::uno::RuntimeException, std::exception ) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames()
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
virtual ::com::sun::star::uno::Type SAL_CALL getElementType()
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL hasElements()
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
// XComponent
virtual void SAL_CALL dispose()
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL addEventListener(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL removeEventListener(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
// XTransactedObject
@@ -146,40 +146,40 @@ public:
virtual void SAL_CALL commit()
throw ( ::com::sun::star::io::IOException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ ::com::sun::star::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL revert()
throw ( ::com::sun::star::io::IOException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ ::com::sun::star::uno::RuntimeException, std::exception ) override;
// XClassifiedObject
virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getClassID()
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
virtual OUString SAL_CALL getClassName()
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL setClassInfo( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aClassID,
const OUString& sClassName )
throw ( ::com::sun::star::lang::NoSupportException,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ ::com::sun::star::uno::RuntimeException, std::exception ) override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
};
generated by cgit (git 2.34.1) at 2025-01-01 16:48:47 +0000