diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-27 13:06:40 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-27 13:06:40 +0000 |
| commit | f26f117c6cdeab38ceda7bbba7f005e9c2d97ef4 (patch) | |
| tree | 1a7d156dcb3bfedeaed1d99acc8d3421ae1a0f10 /store/source/storpage.cxx | |
| parent | 414c097c65bb7925eef9ddc158b112228b49ed12 (diff) | |
MWS_SRX644: migrate branch mws_srx644 -> HEAD
Diffstat (limited to 'store/source/storpage.cxx')
| -rw-r--r-- | store/source/storpage.cxx | 35 |
1 files changed, 4 insertions, 31 deletions
diff --git a/store/source/storpage.cxx b/store/source/storpage.cxx index 01870cce899d..bb1650f9ffab 100644 --- a/store/source/storpage.cxx +++ b/store/source/storpage.cxx @@ -2,9 +2,9 @@ * * $RCSfile: storpage.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mhu $ $Date: 2001-03-13 20:45:39 $ + * last change: $Author: hr $ $Date: 2003-03-27 14:06:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,7 @@ * ************************************************************************/ -#define _STORE_STORPAGE_CXX_ "$Revision: 1.2 $" +#include <storpage.hxx> #ifndef _SAL_TYPES_H_ #include <sal/types.h> @@ -98,9 +98,6 @@ #ifndef _STORE_STORCACH_HXX_ #include <storcach.hxx> #endif -#ifndef _STORE_STORDMON_HXX_ -#include <stordmon.hxx> -#endif #ifndef _STORE_STORDATA_HXX_ #include <stordata.hxx> #endif @@ -108,10 +105,6 @@ #include <stortree.hxx> #endif -#ifndef _STORE_STORPAGE_HXX_ -#include <storpage.hxx> -#endif - using namespace store; /*======================================================================== @@ -125,8 +118,7 @@ const sal_uInt32 OStorePageManager::m_nTypeId = sal_uInt32(0x62190120); * OStorePageManager. */ OStorePageManager::OStorePageManager (void) - : m_xDaemon (NULL), - m_pCache (NULL), + : m_pCache (NULL), m_pDirect (NULL), m_pData (NULL), m_nPageSize (0) @@ -140,9 +132,6 @@ OStorePageManager::OStorePageManager (void) m_pLink[0] = NULL; m_pLink[1] = NULL; m_pLink[2] = NULL; - - // Daemon (kflushd :-). - OStorePageDaemon::getOrCreate (m_xDaemon); } /* @@ -150,13 +139,6 @@ OStorePageManager::OStorePageManager (void) */ OStorePageManager::~OStorePageManager (void) { - osl::MutexGuard aGuard (*this); - if (m_xDaemon.is()) - { - m_xDaemon->remove (this); - m_xDaemon.clear(); - } - delete m_pCache; delete m_pDirect; delete m_pData; @@ -240,12 +222,6 @@ storeError OStorePageManager::initialize ( { m_pNode[1] = new(m_nPageSize) page(m_nPageSize); m_pNode[2] = new(m_nPageSize) page(m_nPageSize); - - if (m_xDaemon.is()) - { - // Request to be flushed. - m_xDaemon->insert (this); - } } // Initialize page cache. @@ -1437,9 +1413,6 @@ storeError OStorePageManager::rebuild ( if (eErrCode != store_E_None) return eErrCode; - // Prevent flush() attempt from daemon during exclusive access. - m_xDaemon.clear(); - // Initialize as 'Destination' with 'Source' page size. eErrCode = self::initialize (pDstLB, store_AccessCreate, nPageSize); if (eErrCode != store_E_None) |