summaryrefslogtreecommitdiff
path: root/store/source
diff options
context:
space:
mode:
Diffstat (limited to 'store/source')
-rw-r--r--store/source/lockbyte.cxx3
-rw-r--r--store/source/lockbyte.hxx12
-rw-r--r--store/source/object.cxx3
-rw-r--r--store/source/object.hxx9
-rw-r--r--store/source/storbase.cxx3
-rw-r--r--store/source/storbase.hxx5
-rw-r--r--store/source/storbios.cxx3
-rw-r--r--store/source/storbios.hxx3
-rw-r--r--store/source/storcach.cxx6
-rw-r--r--store/source/storcach.hxx4
-rw-r--r--store/source/stordata.cxx28
-rw-r--r--store/source/stordata.hxx2
-rw-r--r--store/source/stordir.cxx21
-rw-r--r--store/source/stordir.hxx16
-rw-r--r--store/source/store.cxx3
-rw-r--r--store/source/storlckb.cxx3
-rw-r--r--store/source/storlckb.hxx4
-rw-r--r--store/source/storpage.cxx68
-rw-r--r--store/source/storpage.hxx4
-rw-r--r--store/source/stortree.cxx38
-rw-r--r--store/source/stortree.hxx11
21 files changed, 64 insertions, 185 deletions
diff --git a/store/source/lockbyte.cxx b/store/source/lockbyte.cxx
index 7e4ac7bcbb00..b947dd0e3b97 100644
--- a/store/source/lockbyte.cxx
+++ b/store/source/lockbyte.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -946,3 +947,5 @@ MemoryLockBytes_createInstance (
}
} // namespace store
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/lockbyte.hxx b/store/source/lockbyte.hxx
index b2b6c905f9fd..c54b64d538c8 100644
--- a/store/source/lockbyte.hxx
+++ b/store/source/lockbyte.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,23 +29,13 @@
#ifndef _STORE_LOCKBYTE_HXX_
#define _STORE_LOCKBYTE_HXX_
-#ifndef _SAL_TYPES_H_
#include "sal/types.h"
-#endif
-#ifndef _RTL_REF_HXX_
#include "rtl/ref.hxx"
-#endif
-#ifndef _RTL_USTRING_H_
#include "rtl/ustring.h"
-#endif
-#ifndef _STORE_TYPES_H_
#include "store/types.h"
-#endif
-#ifndef _STORE_STORBASE_HXX_
#include "storbase.hxx"
-#endif
namespace store
{
@@ -182,3 +173,4 @@ MemoryLockBytes_createInstance (
#endif /* !_STORE_LOCKBYTE_HXX_ */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/object.cxx b/store/source/object.cxx
index 40c1cfbbee9c..bebb5f0a170c 100644
--- a/store/source/object.cxx
+++ b/store/source/object.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -110,3 +111,5 @@ oslInterlockedCount SAL_CALL OStoreObject::release (void)
}
} // namespace store
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/object.hxx b/store/source/object.hxx
index a3b5ab1c6e63..5f985f5b66af 100644
--- a/store/source/object.hxx
+++ b/store/source/object.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,17 +29,11 @@
#ifndef _STORE_OBJECT_HXX_
#define _STORE_OBJECT_HXX_
-#ifndef _SAL_TYPES_H_
#include "sal/types.h"
-#endif
-#ifndef _RTL_REF_HXX_
#include "rtl/ref.hxx"
-#endif
-#ifndef _OSL_INTERLCK_H_
#include "osl/interlck.h"
-#endif
namespace store
{
@@ -136,3 +131,5 @@ SAL_CALL query (IStoreHandle *pHandle, OStoreObject*)
} // namespace store
#endif /* !_STORE_OBJECT_HXX_ */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/storbase.cxx b/store/source/storbase.cxx
index 690bff8d258e..8fd79ba27eff 100644
--- a/store/source/storbase.cxx
+++ b/store/source/storbase.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -196,3 +197,5 @@ PageData::Allocator::createInstance (rtl::Reference< PageData::Allocator > & rxA
OStorePageObject::~OStorePageObject (void)
{
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/storbase.hxx b/store/source/storbase.hxx
index 9c1e4ea985bf..e2fe649f743b 100644
--- a/store/source/storbase.hxx
+++ b/store/source/storbase.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +27,7 @@
************************************************************************/
#ifndef _STORE_STORBASE_HXX_
-#define _STORE_STORBASE_HXX_ "$Revision: 1.10.8.4 $"
+#define _STORE_STORBASE_HXX_
#include "sal/types.h"
@@ -952,3 +953,5 @@ inline void OStorePageObject::location (sal_uInt32 nAddr)
} // namespace store
#endif /* !_STORE_STORBASE_HXX_ */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/storbios.cxx b/store/source/storbios.cxx
index d2612d60b3db..b5f247bf4a99 100644
--- a/store/source/storbios.cxx
+++ b/store/source/storbios.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -1127,3 +1128,5 @@ storeError OStorePageBIOS::scanNext (
// Done.
return store_E_CantSeek;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/storbios.hxx b/store/source/storbios.hxx
index 439089d41bd6..74cfdc131584 100644
--- a/store/source/storbios.hxx
+++ b/store/source/storbios.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -265,3 +266,5 @@ inline bool OStorePageBIOS::ScanContext::isValid (void) const
} // namespace store
#endif /* !_STORE_STORBIOS_HXX_ */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/storcach.cxx b/store/source/storcach.cxx
index f0e216575277..79c34492e978 100644
--- a/store/source/storcach.cxx
+++ b/store/source/storcach.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,6 +32,7 @@
#include "storcach.hxx"
#include "sal/types.h"
+#include "sal/macros.h"
#include "rtl/alloc.h"
#include "osl/diagnose.h"
@@ -341,7 +343,7 @@ PageCache_Impl::PageCache_Impl (sal_uInt16 nPageSize)
m_nHit (0),
m_nMissed (0)
{
- static size_t const theSize = sizeof(m_hash_table_0) / sizeof(m_hash_table_0[0]);
+ static size_t const theSize = SAL_N_ELEMENTS(m_hash_table_0);
STORE_STATIC_ASSERT(theSize == theTableSize);
memset(m_hash_table_0, 0, sizeof(m_hash_table_0));
}
@@ -559,3 +561,5 @@ PageCache_createInstance (
}
} // namespace store
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/storcach.hxx b/store/source/storcach.hxx
index 7f56a8d83075..46ad5eff15f0 100644
--- a/store/source/storcach.hxx
+++ b/store/source/storcach.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +27,7 @@
************************************************************************/
#ifndef _STORE_STORCACH_HXX
-#define _STORE_STORCACH_HXX "$Revision: 1.6.8.2 $"
+#define _STORE_STORCACH_HXX
#include "sal/types.h"
#include "rtl/ref.hxx"
@@ -110,3 +111,4 @@ PageCache_createInstance (
#endif /* !_STORE_STORCACH_HXX */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/stordata.cxx b/store/source/stordata.cxx
index 901da15c8040..db85ce0eff13 100644
--- a/store/source/stordata.cxx
+++ b/store/source/stordata.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -723,31 +724,6 @@ OStoreDirectoryPageObject::scope (
return page::SCOPE_UNREACHABLE;
}
-#if 0 /* NYI */
-/*
- * chunk (external data page).
- */
-inode::ChunkDescriptor OStoreDirectoryPageObject::chunk (sal_uInt32 nOffset)
-{
- // @@@ INSUFFICIENT: NEED SCOPE AS WELL @@@
- sal_uInt32 nCapacity = m_rPage.capacity();
- if (nOffset < nCapacity)
- // Internal scope (inode page).
- return inode::ChunkDescriptor (nOffset, nCapacity);
- else
- // External scope (data page).
- return inode::ChunkDescriptor (nOffset - nCapacity, data::capacity(m_rPage.m_aDescr));
-
- inode::ChunkScope eScope = m_rPage.scope(nOffset);
- if (eScope == inode::SCOPE_INTERNAL)
- // Inode page (internal scope).
- return inode::ChunkDescriptor (nOffset, m_rPage.capacity());
- else
- // Data page (external scope).
- return inode::ChunkDescriptor (nOffset - m_rPage.capacity(), data::capacity(m_rPage.m_aDescr));
-}
-#endif /* NYI */
-
/*
* read (external data page).
*/
@@ -1128,3 +1104,5 @@ storeError OStoreDirectoryPageObject::truncate (
// Invalid scope.
return store_E_InvalidAccess;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/stordata.hxx b/store/source/stordata.hxx
index 01ea2c0f86ec..61625c32c046 100644
--- a/store/source/stordata.hxx
+++ b/store/source/stordata.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -868,3 +869,4 @@ private:
#endif /* !_STORE_STORDATA_HXX_ */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/stordir.cxx b/store/source/stordir.cxx
index 0b3f16da3cfb..01d4357a2a46 100644
--- a/store/source/stordir.cxx
+++ b/store/source/stordir.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,37 +31,19 @@
#include "stordir.hxx"
-#ifndef _SAL_TYPES_H_
#include <sal/types.h>
-#endif
-#ifndef _RTL_TEXTCVT_H_
#include <rtl/textcvt.h>
-#endif
-#ifndef _RTL_REF_HXX_
#include <rtl/ref.hxx>
-#endif
-#ifndef _OSL_MUTEX_HXX_
#include <osl/mutex.hxx>
-#endif
-#ifndef _STORE_TYPES_H_
#include "store/types.h"
-#endif
-#ifndef _STORE_OBJECT_HXX_
#include "object.hxx"
-#endif
-#ifndef _STORE_STORBASE_HXX_
#include "storbase.hxx"
-#endif
-#ifndef _STORE_STORDATA_HXX_
#include "stordata.hxx"
-#endif
-#ifndef _STORE_STORPAGE_HXX_
#include "storpage.hxx"
-#endif
using namespace store;
@@ -239,3 +222,5 @@ storeError OStoreDirectory_Impl::iterate (storeFindData &rFindData)
memset (&rFindData, 0, sizeof (storeFindData));
return store_E_NoMoreFiles;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/stordir.hxx b/store/source/stordir.hxx
index 2e3d79e71319..44c14f19cdae 100644
--- a/store/source/stordir.hxx
+++ b/store/source/stordir.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,29 +29,15 @@
#ifndef _STORE_STORDIR_HXX_
#define _STORE_STORDIR_HXX_
-#ifndef _SAL_TYPES_H_
#include <sal/types.h>
-#endif
-#ifndef _RTL_TEXTCVT_H_
#include <rtl/textcvt.h>
-#endif
-#ifndef _RTL_STRING_H_
#include <rtl/string.h>
-#endif
-#ifndef _RTL_REF_HXX_
#include <rtl/ref.hxx>
-#endif
-#ifndef _STORE_OBJECT_HXX_
#include "object.hxx"
-#endif
-#ifndef _STORE_STORBASE_HXX_
#include "storbase.hxx"
-#endif
-#ifndef _STORE_STORPAGE_HXX_
#include "storpage.hxx"
-#endif
namespace store
{
@@ -147,3 +134,4 @@ SAL_CALL query (IStoreHandle *pHandle, OStoreDirectory_Impl*)
#endif /* !_STORE_STORDIR_HXX_ */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/store.cxx b/store/source/store.cxx
index fdcce8dd2d00..a77b34acc9ca 100644
--- a/store/source/store.cxx
+++ b/store/source/store.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -763,3 +764,5 @@ storeError SAL_CALL store_remove (
// Remove.
return xManager->remove (aKey);
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/storlckb.cxx b/store/source/storlckb.cxx
index 5a02131d53eb..658ec52646b6 100644
--- a/store/source/storlckb.cxx
+++ b/store/source/storlckb.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -449,3 +450,5 @@ storeError OStoreLockBytes::stat (sal_uInt32 &rnSize)
rnSize = aPage.dataLength();
return store_E_None;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/storlckb.hxx b/store/source/storlckb.hxx
index fd6ef7384613..352095b72bc0 100644
--- a/store/source/storlckb.hxx
+++ b/store/source/storlckb.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +27,7 @@
************************************************************************/
#ifndef _STORE_STORLCKB_HXX_
-#define _STORE_STORLCKB_HXX_ "$Revision: 1.6.8.1 $"
+#define _STORE_STORLCKB_HXX_
#include "sal/types.h"
@@ -169,3 +170,4 @@ SAL_CALL query (IStoreHandle *pHandle, OStoreLockBytes*)
#endif /* !_STORE_STORLCKB_HXX_ */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/storpage.cxx b/store/source/storpage.cxx
index a49e850061b6..b91528a615df 100644
--- a/store/source/storpage.cxx
+++ b/store/source/storpage.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -163,71 +164,6 @@ storeError OStorePageManager::find_lookup (
* remove_Impl (possibly down from root).
* Internal: Precond: initialized, writeable, exclusive access.
*/
-#if 0 /* EXP */
-storeError OStorePageManager::remove_Impl (entry & rEntry)
-{
- // Find Node and Index.
- OStoreBTreeNodeObject aNode;
- sal_uInt16 nIndex = 0;
- eErrCode = m_aRoot.find_lookup (aNode, nIndex, entry::CompareGreater(rEntry), *this);
-
- // @@@
-
- PageHolderObject< page > xPage (aNode.get());
- page & rPage = (*xPage);
-
- // Check current page index.
- sal_uInt16 i = rPage.find (rEntry), n = rPage.usageCount();
- if (!(i < n))
- {
- // Path to entry not exists (Must not happen(?)).
- return store_E_NotExists;
- }
-
- // Compare entry.
- entry::CompareResult result = rEntry.compare (rPage.m_pData[i]);
-
- for (; result == entry::COMPARE_GREATER && xPage->depth() > 0; )
- {
- // Check next node address.
- sal_uInt32 const nAddr = rPage.m_pData[i].m_aLink.location();
- if (nAddr == STORE_PAGE_NULL)
- {
- // Path to entry not exists (Must not happen(?)).
- return store_E_NotExists;
- }
-
- // Load next node page.
- eErrCode = loadObjectAt (aNode, nAddr);
-
- PageHolderObject< page > xNext (aNode.get());
- xNext.swap (xPage);
- }
-
- aNode.remove (nIndex, rEntry, *this);
-
-
- do
- {
- // Load next node page.
- eErrCode = loadObjectAt (aNode, nAddr);
-
- page const & rPage = (*xPage);
-
- // Check current page index.
- sal_uInt16 i = rPage.find (rEntry), n = rPage.usageCount();
- if (!(i < n))
- {
- // Path to entry not exists (Must not happen(?)).
- return store_E_NotExists;
- }
-
- // Compare entry.
- result = rEntry.compare (rPage.m_pData[i]);
-
- } while (result == entry::COMPATE_GREATER);
-}
-#endif /* EXP */
storeError OStorePageManager::remove_Impl (entry & rEntry)
{
@@ -1055,3 +991,5 @@ storeError OStorePageManager::rebuild (
// Done.
return store_E_None;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/storpage.hxx b/store/source/storpage.hxx
index bd5d60a72d3c..80841a618e72 100644
--- a/store/source/storpage.hxx
+++ b/store/source/storpage.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +27,7 @@
************************************************************************/
#ifndef _STORE_STORPAGE_HXX_
-#define _STORE_STORPAGE_HXX_ "$Revision: 1.6.8.2 $"
+#define _STORE_STORPAGE_HXX_
#include "sal/types.h"
@@ -224,3 +225,4 @@ SAL_CALL query (IStoreHandle *pHandle, OStorePageManager*)
#endif /* !_STORE_STORPAGE_HXX_ */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/stortree.cxx b/store/source/stortree.cxx
index 23d7ca778961..508748c3b285 100644
--- a/store/source/stortree.cxx
+++ b/store/source/stortree.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -124,22 +125,6 @@ void OStoreBTreeNodeData::remove (sal_uInt16 i)
}
}
-#if 0 /* NYI */
-/*
- * merge (with right page).
- */
-void OStoreBTreeNodeData::merge (const self& rPageR)
-{
- sal_uInt16 const n = usageCount();
- sal_uInt16 const m = rPageR.usageCount();
- if ((n + m) <= capacityCount())
- {
- memcpy (&(m_pData[n]), &(rPageR.m_pData[0]), m * sizeof(T));
- usageCount (n + m);
- }
-}
-#endif
-
/*
* split (left half copied from right half of left page).
*/
@@ -280,25 +265,6 @@ storeError OStoreBTreeNodeObject::remove (
}
else
{
-#if 0 /* NYI */
- // Check for right sibling.
- sal_uInt16 const nIndexR = nIndexL + 1;
- if (nIndexR < rPage.usageCount())
- {
- // Load right link node.
- self aNodeR;
- eErrCode = rBIOS.loadObjectAt (aNodeR, rPage.m_pData[nIndexR].m_aLink.location());
- if (eErrCode == store_E_None)
- {
- if (rPageL.queryMerge (rPageR))
- {
- rPageL.merge (rPageR);
-
- eErrCode = rBIOS.free (rPageR.location());
- }
- }
- }
-#endif /* NYI */
// Relink.
rPage.m_pData[nIndexL].m_aKey = xPageL->m_pData[0].m_aKey;
@@ -580,3 +546,5 @@ storeError OStoreBTreeRootObject::find_insert (
(void) testInvariant("OStoreBTreeRootObject::find_insert(): leave");
return store_E_None;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/stortree.hxx b/store/source/stortree.hxx
index 820b270b3649..15cb581d1e01 100644
--- a/store/source/stortree.hxx
+++ b/store/source/stortree.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +27,7 @@
************************************************************************/
#ifndef _STORE_STORTREE_HXX
-#define _STORE_STORTREE_HXX "$Revision: 1.6.8.2 $"
+#define _STORE_STORTREE_HXX
#include "sal/types.h"
@@ -221,12 +222,6 @@ struct OStoreBTreeNodeData : public store::OStorePageData
void insert (sal_uInt16 i, const T& t);
void remove (sal_uInt16 i);
-#if 0 /* NYI */
- /** merge (with right page).
- */
- void merge (const self& rPageR);
-#endif
-
/** split (left half copied from right half of left page).
*/
void split (const self& rPageL);
@@ -343,3 +338,5 @@ private:
} // namespace store
#endif /* !_STORE_STORTREE_HXX */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
generated by cgit (git 2.34.1) at 2024-07-16 23:22:11 +0000