summaryrefslogtreecommitdiff
path: root/include/tools
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-12 16:04:04 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-12 17:52:29 +0200
commitb36963c0a6a09f70ca6d8d607dd3249a3496497d (patch)
tree33e06dc8d227957cb31355277fb5cf20b9918628 /include/tools
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'include/tools')
-rw-r--r--include/tools/b3dtrans.hxx2
-rw-r--r--include/tools/pstm.hxx16
-rw-r--r--include/tools/rtti.hxx8
-rw-r--r--include/tools/stream.hxx38
4 files changed, 32 insertions, 32 deletions
diff --git a/include/tools/b3dtrans.hxx b/include/tools/b3dtrans.hxx
index 454773c74ecd..1abea820ca99 100644
--- a/include/tools/b3dtrans.hxx
+++ b/include/tools/b3dtrans.hxx
@@ -232,7 +232,7 @@ protected:
void CalcNewViewportValues();
bool CalcFocalLength();
- virtual void DeviceRectangleChange() SAL_OVERRIDE;
+ virtual void DeviceRectangleChange() override;
};
#endif
diff --git a/include/tools/pstm.hxx b/include/tools/pstm.hxx
index 577c301d0c8c..56aa05645a6b 100644
--- a/include/tools/pstm.hxx
+++ b/include/tools/pstm.hxx
@@ -58,9 +58,9 @@ public:
static void * CreateInstance( SvPersistBase ** ppBase ); \
friend SvPersistStream& operator >> ( SvPersistStream & rStm, \
Class *& rpObj); \
- virtual sal_Int32 GetClassId() const SAL_OVERRIDE; \
- virtual void Load( SvPersistStream & ) SAL_OVERRIDE; \
- virtual void Save( SvPersistStream & ) SAL_OVERRIDE;
+ virtual sal_Int32 GetClassId() const override; \
+ virtual void Load( SvPersistStream & ) override; \
+ virtual void Save( SvPersistStream & ) override;
#define PRV_SV_IMPL_PERSIST( Class ) \
void * Class::CreateInstance( SvPersistBase ** ppBase )\
@@ -142,17 +142,17 @@ class TOOLS_DLLPUBLIC SvPersistStream : public SvStream
sal_uIntPtr nStartIdx;
const SvPersistStream * pRefStm;
- virtual sal_uIntPtr GetData( void* pData, sal_uIntPtr nSize ) SAL_OVERRIDE;
- virtual sal_uIntPtr PutData( const void* pData, sal_uIntPtr nSize ) SAL_OVERRIDE;
- virtual sal_uInt64 SeekPos(sal_uInt64 nPos) SAL_OVERRIDE;
- virtual void FlushData() SAL_OVERRIDE;
+ virtual sal_uIntPtr GetData( void* pData, sal_uIntPtr nSize ) override;
+ virtual sal_uIntPtr PutData( const void* pData, sal_uIntPtr nSize ) override;
+ virtual sal_uInt64 SeekPos(sal_uInt64 nPos) override;
+ virtual void FlushData() override;
protected:
void WriteObj( sal_uInt8 nHdr, SvPersistBase * pObj );
sal_uInt32 ReadObj( SvPersistBase * & rpObj, bool bRegister );
public:
- virtual void ResetError() SAL_OVERRIDE;
+ virtual void ResetError() override;
SvPersistStream( SvClassManager &, SvStream * pStream,
sal_uInt32 nStartIdx = 1 );
diff --git a/include/tools/rtti.hxx b/include/tools/rtti.hxx
index 9f178d2ae739..ad13cef32ee6 100644
--- a/include/tools/rtti.hxx
+++ b/include/tools/rtti.hxx
@@ -36,15 +36,15 @@ typedef void* (*TypeId)();
static void* CreateType(); \
static TypeId StaticType(); \
static bool IsOf( TypeId aSameOrSuperType ); \
- virtual TypeId Type() const SAL_OVERRIDE; \
- virtual bool IsA( TypeId aSameOrSuperType ) const SAL_OVERRIDE
+ virtual TypeId Type() const override; \
+ virtual bool IsA( TypeId aSameOrSuperType ) const override
#define TYPEINFO_VISIBILITY_OVERRIDE(visibility) \
visibility static void* CreateType(); \
visibility static TypeId StaticType(); \
visibility static bool IsOf( TypeId aSameOrSuperType ); \
- visibility virtual TypeId Type() const SAL_OVERRIDE; \
- visibility virtual bool IsA( TypeId aSameOrSuperType ) const SAL_OVERRIDE
+ visibility virtual TypeId Type() const override; \
+ visibility virtual bool IsA( TypeId aSameOrSuperType ) const override
#define TYPEINIT_FACTORY(sType, Factory ) \
void* sType::CreateType() { return Factory; } \
diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index 19f062ee2e3a..46296bb069c1 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -172,14 +172,14 @@ public:
SvOpenLockBytes(pStream, bOwner), m_nSize(0), m_bTerminated(false) {}
virtual ErrCode ReadAt(sal_uInt64 nPos, void * pBuffer, sal_Size nCount,
- sal_Size * pRead) const SAL_OVERRIDE;
+ sal_Size * pRead) const override;
virtual ErrCode WriteAt(sal_uInt64 nPos, const void * pBuffer, sal_Size nCount,
- sal_Size * pWritten) SAL_OVERRIDE;
+ sal_Size * pWritten) override;
virtual ErrCode FillAppend(const void * pBuffer, sal_Size nCount,
- sal_Size * pWritten) SAL_OVERRIDE;
+ sal_Size * pWritten) override;
- virtual void Terminate() SAL_OVERRIDE { m_bTerminated = true; }
+ virtual void Terminate() override { m_bTerminated = true; }
};
@@ -631,11 +631,11 @@ private:
bool UnlockFile();
protected:
- virtual sal_Size GetData( void* pData, sal_Size nSize ) SAL_OVERRIDE;
- virtual sal_Size PutData( const void* pData, sal_Size 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 sal_Size GetData( void* pData, sal_Size nSize ) override;
+ virtual sal_Size PutData( const void* pData, sal_Size nSize ) override;
+ virtual sal_uInt64 SeekPos( sal_uInt64 nPos ) override;
+ virtual void SetSize( sal_uInt64 nSize ) override;
+ virtual void FlushData() override;
public:
// Switches to Read StreamMode on failed attempt of Write opening
@@ -643,7 +643,7 @@ public:
SvFileStream();
virtual ~SvFileStream();
- virtual void ResetError() SAL_OVERRIDE;
+ virtual void ResetError() override;
void Open( const OUString& rFileName, StreamMode eOpenMode );
void Close();
@@ -667,11 +667,11 @@ protected:
sal_uInt8* pBuf;
bool bOwnsData;
- virtual sal_Size GetData( void* pData, sal_Size nSize ) SAL_OVERRIDE;
- virtual sal_Size PutData( const void* pData, sal_Size 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 sal_Size GetData( void* pData, sal_Size nSize ) override;
+ virtual sal_Size PutData( const void* pData, sal_Size nSize ) override;
+ virtual sal_uInt64 SeekPos( sal_uInt64 nPos ) override;
+ virtual void SetSize( sal_uInt64 nSize ) override;
+ virtual void FlushData() override;
/// AllocateMemory must update pBuf accordingly
/// - pBuf: Address of new block
@@ -696,7 +696,7 @@ public:
SvMemoryStream( sal_Size nInitSize=512, sal_Size nResize=64 );
virtual ~SvMemoryStream();
- virtual void ResetError() SAL_OVERRIDE;
+ virtual void ResetError() override;
const void* GetBuffer();
sal_uIntPtr GetSize();
@@ -710,7 +710,7 @@ public:
void ObjectOwnsMemory( bool bOwn ) { bOwnsData = bOwn; }
void SetResizeOffset( sal_Size nNewResize ) { nResize = nNewResize; }
- virtual sal_uInt64 remainingSize() SAL_OVERRIDE { return GetEndOfData() - Tell(); }
+ virtual sal_uInt64 remainingSize() override { return GetEndOfData() - Tell(); }
};
class TOOLS_DLLPUBLIC SvScriptStream: public SvStream
@@ -722,8 +722,8 @@ public:
SvScriptStream(const OUString& rUrl);
virtual ~SvScriptStream();
- virtual bool ReadLine(OString &rStr, sal_Int32) SAL_OVERRIDE;
- virtual bool good() const SAL_OVERRIDE;
+ virtual bool ReadLine(OString &rStr, sal_Int32) override;
+ virtual bool good() const override;
};
/** Data Copy Stream