From b36963c0a6a09f70ca6d8d607dd3249a3496497d Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 12 Oct 2015 16:04:04 +0200
Subject: Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code

Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
---
 store/source/lockbyte.cxx | 52 +++++++++++++++++++++++------------------------
 store/source/storbase.cxx |  4 ++--
 store/source/stordata.hxx | 12 +++++------
 store/source/stordir.hxx  |  2 +-
 store/source/storlckb.hxx |  2 +-
 store/source/storpage.hxx |  4 ++--
 store/source/stortree.hxx |  4 ++--
 7 files changed, 40 insertions(+), 40 deletions(-)

(limited to 'store')

diff --git a/store/source/lockbyte.cxx b/store/source/lockbyte.cxx
index 552199366781..2f6aefcba872 100644
--- a/store/source/lockbyte.cxx
+++ b/store/source/lockbyte.cxx
@@ -291,18 +291,18 @@ class FileLockBytes :
 
     /** ILockBytes implementation.
      */
-    virtual storeError initialize_Impl (rtl::Reference< PageData::Allocator > & rxAllocator, sal_uInt16 nPageSize) SAL_OVERRIDE;
+    virtual storeError initialize_Impl (rtl::Reference< PageData::Allocator > & rxAllocator, sal_uInt16 nPageSize) override;
 
-    virtual storeError readPageAt_Impl (PageHolder & rPage, sal_uInt32 nOffset) SAL_OVERRIDE;
-    virtual storeError writePageAt_Impl (PageHolder const & rPage, sal_uInt32 nOffset) SAL_OVERRIDE;
+    virtual storeError readPageAt_Impl (PageHolder & rPage, sal_uInt32 nOffset) override;
+    virtual storeError writePageAt_Impl (PageHolder const & rPage, sal_uInt32 nOffset) override;
 
-    virtual storeError readAt_Impl (sal_uInt32 nOffset, void * pBuffer, sal_uInt32 nBytes) SAL_OVERRIDE;
-    virtual storeError writeAt_Impl (sal_uInt32 nOffset, void const * pBuffer, sal_uInt32 nBytes) SAL_OVERRIDE;
+    virtual storeError readAt_Impl (sal_uInt32 nOffset, void * pBuffer, sal_uInt32 nBytes) override;
+    virtual storeError writeAt_Impl (sal_uInt32 nOffset, void const * pBuffer, sal_uInt32 nBytes) override;
 
-    virtual storeError getSize_Impl (sal_uInt32 & rnSize) SAL_OVERRIDE;
-    virtual storeError setSize_Impl (sal_uInt32 nSize) SAL_OVERRIDE;
+    virtual storeError getSize_Impl (sal_uInt32 & rnSize) override;
+    virtual storeError setSize_Impl (sal_uInt32 nSize) override;
 
-    virtual storeError flush_Impl() SAL_OVERRIDE;
+    virtual storeError flush_Impl() override;
 
 public:
     /** Construction.
@@ -511,23 +511,23 @@ class MappedLockBytes :
 
     /** PageData::Allocator implementation.
      */
-    virtual void allocate_Impl (void ** ppPage, sal_uInt16 * pnSize) SAL_OVERRIDE;
-    virtual void deallocate_Impl (void * pPage) SAL_OVERRIDE;
+    virtual void allocate_Impl (void ** ppPage, sal_uInt16 * pnSize) override;
+    virtual void deallocate_Impl (void * pPage) override;
 
     /** ILockBytes implementation.
      */
-    virtual storeError initialize_Impl (rtl::Reference< PageData::Allocator > & rxAllocator, sal_uInt16 nPageSize) SAL_OVERRIDE;
+    virtual storeError initialize_Impl (rtl::Reference< PageData::Allocator > & rxAllocator, sal_uInt16 nPageSize) override;
 
-    virtual storeError readPageAt_Impl (PageHolder & rPage, sal_uInt32 nOffset) SAL_OVERRIDE;
-    virtual storeError writePageAt_Impl (PageHolder const & rPage, sal_uInt32 nOffset) SAL_OVERRIDE;
+    virtual storeError readPageAt_Impl (PageHolder & rPage, sal_uInt32 nOffset) override;
+    virtual storeError writePageAt_Impl (PageHolder const & rPage, sal_uInt32 nOffset) override;
 
-    virtual storeError readAt_Impl  (sal_uInt32 nOffset, void * pBuffer, sal_uInt32 nBytes) SAL_OVERRIDE;
-    virtual storeError writeAt_Impl (sal_uInt32 nOffset, const void * pBuffer, sal_uInt32 nBytes) SAL_OVERRIDE;
+    virtual storeError readAt_Impl  (sal_uInt32 nOffset, void * pBuffer, sal_uInt32 nBytes) override;
+    virtual storeError writeAt_Impl (sal_uInt32 nOffset, const void * pBuffer, sal_uInt32 nBytes) override;
 
-    virtual storeError getSize_Impl (sal_uInt32 & rnSize) SAL_OVERRIDE;
-    virtual storeError setSize_Impl (sal_uInt32 nSize) SAL_OVERRIDE;
+    virtual storeError getSize_Impl (sal_uInt32 & rnSize) override;
+    virtual storeError setSize_Impl (sal_uInt32 nSize) override;
 
-    virtual storeError flush_Impl() SAL_OVERRIDE;
+    virtual storeError flush_Impl() override;
 
 public:
     /** Construction.
@@ -649,18 +649,18 @@ class MemoryLockBytes :
 
     /** ILockBytes implementation.
      */
-    virtual storeError initialize_Impl (rtl::Reference< PageData::Allocator > & rxAllocator, sal_uInt16 nPageSize) SAL_OVERRIDE;
+    virtual storeError initialize_Impl (rtl::Reference< PageData::Allocator > & rxAllocator, sal_uInt16 nPageSize) override;
 
-    virtual storeError readPageAt_Impl (PageHolder & rPage, sal_uInt32 nOffset) SAL_OVERRIDE;
-    virtual storeError writePageAt_Impl (PageHolder const & rPage, sal_uInt32 nOffset) SAL_OVERRIDE;
+    virtual storeError readPageAt_Impl (PageHolder & rPage, sal_uInt32 nOffset) override;
+    virtual storeError writePageAt_Impl (PageHolder const & rPage, sal_uInt32 nOffset) override;
 
-    virtual storeError readAt_Impl  (sal_uInt32 nOffset, void * pBuffer, sal_uInt32 nBytes) SAL_OVERRIDE;
-    virtual storeError writeAt_Impl (sal_uInt32 nOffset, const void * pBuffer, sal_uInt32 nBytes) SAL_OVERRIDE;
+    virtual storeError readAt_Impl  (sal_uInt32 nOffset, void * pBuffer, sal_uInt32 nBytes) override;
+    virtual storeError writeAt_Impl (sal_uInt32 nOffset, const void * pBuffer, sal_uInt32 nBytes) override;
 
-    virtual storeError getSize_Impl (sal_uInt32 & rnSize) SAL_OVERRIDE;
-    virtual storeError setSize_Impl (sal_uInt32 nSize) SAL_OVERRIDE;
+    virtual storeError getSize_Impl (sal_uInt32 & rnSize) override;
+    virtual storeError setSize_Impl (sal_uInt32 nSize) override;
 
-    virtual storeError flush_Impl() SAL_OVERRIDE;
+    virtual storeError flush_Impl() override;
 
 public:
     /** Construction.
diff --git a/store/source/storbase.cxx b/store/source/storbase.cxx
index a96c97bd0c08..9281b38f0c10 100644
--- a/store/source/storbase.cxx
+++ b/store/source/storbase.cxx
@@ -97,8 +97,8 @@ private:
 
     /** PageData::Allocator implementation.
      */
-    virtual void allocate_Impl (void ** ppPage, sal_uInt16 * pnSize) SAL_OVERRIDE;
-    virtual void deallocate_Impl (void * pPage) SAL_OVERRIDE;
+    virtual void allocate_Impl (void ** ppPage, sal_uInt16 * pnSize) override;
+    virtual void deallocate_Impl (void * pPage) override;
 };
 
 } // namespace store
diff --git a/store/source/stordata.hxx b/store/source/stordata.hxx
index ca116bba1273..90e5cdaf7933 100644
--- a/store/source/stordata.hxx
+++ b/store/source/stordata.hxx
@@ -112,8 +112,8 @@ public:
 
     /** External representation.
      */
-    virtual storeError guard  (sal_uInt32 nAddr) SAL_OVERRIDE;
-    virtual storeError verify (sal_uInt32 nAddr) const SAL_OVERRIDE;
+    virtual storeError guard  (sal_uInt32 nAddr) override;
+    virtual storeError verify (sal_uInt32 nAddr) const override;
 };
 
 /*========================================================================
@@ -226,8 +226,8 @@ public:
         sal_uInt32       nAddr,
         OStorePageBIOS & rBIOS);
 
-    virtual storeError guard  (sal_uInt32 nAddr) SAL_OVERRIDE;
-    virtual storeError verify (sal_uInt32 nAddr) const SAL_OVERRIDE;
+    virtual storeError guard  (sal_uInt32 nAddr) override;
+    virtual storeError verify (sal_uInt32 nAddr) const override;
 
     /** read (indirect data page).
     */
@@ -647,8 +647,8 @@ public:
 
     /** External representation.
     */
-    virtual storeError guard  (sal_uInt32 nAddr) SAL_OVERRIDE;
-    virtual storeError verify (sal_uInt32 nAddr) const SAL_OVERRIDE;
+    virtual storeError guard  (sal_uInt32 nAddr) override;
+    virtual storeError verify (sal_uInt32 nAddr) const override;
 
     /** attrib.
     */
diff --git a/store/source/stordir.hxx b/store/source/stordir.hxx
index 5deea4f3cb73..89027705ffb6 100644
--- a/store/source/stordir.hxx
+++ b/store/source/stordir.hxx
@@ -70,7 +70,7 @@ public:
 
     /** IStoreHandle.
      */
-    virtual bool isKindOf (sal_uInt32 nTypeId) SAL_OVERRIDE;
+    virtual bool isKindOf (sal_uInt32 nTypeId) override;
 
 protected:
     /** Destruction.
diff --git a/store/source/storlckb.hxx b/store/source/storlckb.hxx
index 0ab9237c0c8b..184f14ccca03 100644
--- a/store/source/storlckb.hxx
+++ b/store/source/storlckb.hxx
@@ -105,7 +105,7 @@ public:
 
     /** IStoreHandle.
      */
-    virtual bool isKindOf (sal_uInt32 nMagic) SAL_OVERRIDE;
+    virtual bool isKindOf (sal_uInt32 nMagic) override;
 
 protected:
     /** Destruction (OReference).
diff --git a/store/source/storpage.hxx b/store/source/storpage.hxx
index 687b38b943e8..cdeeea68e2e2 100644
--- a/store/source/storpage.hxx
+++ b/store/source/storpage.hxx
@@ -52,7 +52,7 @@ public:
     virtual storeError initialize (
         ILockBytes *    pLockBytes,
         storeAccessMode eAccessMode,
-        sal_uInt16 &    rnPageSize) SAL_OVERRIDE;
+        sal_uInt16 &    rnPageSize) override;
 
     /** isValid.
      *  @return sal_True  upon successful initialization,
@@ -130,7 +130,7 @@ public:
 
     /** IStoreHandle.
      */
-    virtual bool isKindOf (sal_uInt32 nTypeId) SAL_OVERRIDE;
+    virtual bool isKindOf (sal_uInt32 nTypeId) override;
 
 protected:
     /** Destruction.
diff --git a/store/source/stortree.hxx b/store/source/stortree.hxx
index 7c865637068d..94e61a11bd24 100644
--- a/store/source/stortree.hxx
+++ b/store/source/stortree.hxx
@@ -239,8 +239,8 @@ public:
 
     /** External representation.
     */
-    virtual storeError guard  (sal_uInt32 nAddr) SAL_OVERRIDE;
-    virtual storeError verify (sal_uInt32 nAddr) const SAL_OVERRIDE;
+    virtual storeError guard  (sal_uInt32 nAddr) override;
+    virtual storeError verify (sal_uInt32 nAddr) const override;
 
     /** split.
      *
-- 
cgit v1.2.3