From 904959b85853be0a79c757f9df92e1a9b7e0c01c Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 30 Sep 2016 10:38:20 +0200
Subject: Remove OStorePageData typedef

Change-Id: I9f4e8fa41a59325fe7036acb66d045a833294bd6
---
 store/source/storbase.hxx |  3 +--
 store/source/storcach.cxx |  2 +-
 store/source/stordata.hxx | 12 ++++++------
 store/source/stortree.cxx |  2 +-
 store/source/stortree.hxx |  4 ++--
 5 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'store')

diff --git a/store/source/storbase.hxx b/store/source/storbase.hxx
index 7d006c61e4fe..49ff131657db 100644
--- a/store/source/storbase.hxx
+++ b/store/source/storbase.hxx
@@ -331,7 +331,6 @@ struct OStorePageLink
  * PageData.
  *
  *======================================================================*/
-typedef struct PageData OStorePageData; // backward compat.
 struct PageData
 {
     typedef OStorePageGuard      G;
@@ -678,7 +677,7 @@ class OStorePageBIOS;
 
 class OStorePageObject
 {
-    typedef OStorePageData       page;
+    typedef PageData       page;
 
 public:
     /** Allocation.
diff --git a/store/source/storcach.cxx b/store/source/storcach.cxx
index d8449be56440..a37a0175fa8d 100644
--- a/store/source/storcach.cxx
+++ b/store/source/storcach.cxx
@@ -403,7 +403,7 @@ storeError PageCache::removePageAt (sal_uInt32 nOffset)
  * Old OStorePageCache implementation.
  *
  * (two-way association (sorted address array, LRU chain)).
- * (external OStorePageData representation).
+ * (external PageData representation).
  *
  */
 
diff --git a/store/source/stordata.hxx b/store/source/stordata.hxx
index c9946c22e8ca..2c3a28b33437 100644
--- a/store/source/stordata.hxx
+++ b/store/source/stordata.hxx
@@ -39,9 +39,9 @@ namespace store
  *======================================================================*/
 #define STORE_MAGIC_DATAPAGE sal_uInt32(0x94190310)
 
-struct OStoreDataPageData : public store::OStorePageData
+struct OStoreDataPageData : public store::PageData
 {
-    typedef OStorePageData       base;
+    typedef PageData       base;
     typedef OStoreDataPageData   self;
 
     typedef OStorePageDescriptor D;
@@ -123,9 +123,9 @@ public:
  *======================================================================*/
 #define STORE_MAGIC_INDIRECTPAGE sal_uInt32(0x89191107)
 
-struct OStoreIndirectionPageData : public store::OStorePageData
+struct OStoreIndirectionPageData : public store::PageData
 {
-    typedef OStorePageData            base;
+    typedef PageData            base;
     typedef OStoreIndirectionPageData self;
 
     typedef OStorePageGuard           G;
@@ -519,9 +519,9 @@ struct OStoreDirectoryDataBlock
  *======================================================================*/
 #define STORE_MAGIC_DIRECTORYPAGE sal_uInt32(0x62190120)
 
-struct OStoreDirectoryPageData : public store::OStorePageData
+struct OStoreDirectoryPageData : public store::PageData
 {
-    typedef OStorePageData           base;
+    typedef PageData           base;
     typedef OStoreDirectoryPageData  self;
 
     typedef OStorePageDescriptor     D;
diff --git a/store/source/stortree.cxx b/store/source/stortree.cxx
index d8d6d026ae0a..fec3138e8144 100644
--- a/store/source/stortree.cxx
+++ b/store/source/stortree.cxx
@@ -39,7 +39,7 @@ using namespace store;
  * OStoreBTreeNodeData.
  */
 OStoreBTreeNodeData::OStoreBTreeNodeData (sal_uInt16 nPageSize)
-    : OStorePageData (nPageSize)
+    : PageData (nPageSize)
 {
     base::m_aGuard.m_nMagic = store::htonl(self::theTypeId);
     base::m_aDescr.m_nUsed  = store::htons(self::thePageSize); // usageCount(0)
diff --git a/store/source/stortree.hxx b/store/source/stortree.hxx
index 1146859aa1f4..f5aea525ecc5 100644
--- a/store/source/stortree.hxx
+++ b/store/source/stortree.hxx
@@ -100,9 +100,9 @@ struct OStoreBTreeEntry
  *======================================================================*/
 #define STORE_MAGIC_BTREENODE sal_uInt32(0x58190322)
 
-struct OStoreBTreeNodeData : public store::OStorePageData
+struct OStoreBTreeNodeData : public store::PageData
 {
-    typedef OStorePageData      base;
+    typedef PageData      base;
     typedef OStoreBTreeNodeData self;
 
     typedef OStorePageGuard     G;
-- 
cgit