diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 23:34:06 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 23:34:06 +0000 |
| commit | 419861a222cd22b6b95c9d4b3a5e3bf4d8f0cde3 (patch) | |
| tree | 598719063e7a6f5aef93eca21ee5eb64eacf4b7f /store/source/storpage.cxx | |
| parent | 749022f174349185f0eecaa458936d7cbbfc9b37 (diff) | |
INTEGRATION: CWS warnings01 (1.3.92); FILE MERGED
2006/04/07 20:02:19 sb 1.3.92.4: RESYNC: (1.4-1.5); FILE MERGED
2005/09/22 21:58:55 sb 1.3.92.3: RESYNC: (1.3-1.4); FILE MERGED
2005/09/02 16:30:33 sb 1.3.92.2: #i53898# Made code warning-free.
2005/08/29 14:08:47 sb 1.3.92.1: #i53898# Made code warning-free.
Diffstat (limited to 'store/source/storpage.cxx')
| -rw-r--r-- | store/source/storpage.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/store/source/storpage.cxx b/store/source/storpage.cxx index 8925e0f0fbc4..475d37d59b72 100644 --- a/store/source/storpage.cxx +++ b/store/source/storpage.cxx @@ -4,9 +4,9 @@ * * $RCSfile: storpage.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: kz $ $Date: 2006-02-28 10:32:39 $ + * last change: $Author: hr $ $Date: 2006-06-20 00:34:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -138,7 +138,7 @@ sal_Bool SAL_CALL OStorePageManager::isKindOf (sal_uInt32 nTypeId) * initialize (two-phase construction). * Precond: none. */ -storeError OStorePageManager::initialize ( +storeError OStorePageManager::initializeManager ( ILockBytes *pLockBytes, storeAccessMode eAccessMode, sal_uInt16 nPageSize) @@ -359,10 +359,10 @@ storeError OStorePageManager::flush (void) return store_E_None; // Flush cache. - storeError eErrCode = m_pCache->flush (*this, NULL); - OSL_POSTCOND( - eErrCode == store_E_None, - "OStorePageManager::flush(): cache::flush() failed"); + if (m_pCache->flush (*this, NULL) != store_E_None) { + OSL_POSTCOND( + false, "OStorePageManager::flush(): cache::flush() failed"); + } // Flush base. return base::flush(); @@ -1236,7 +1236,7 @@ storeError OStorePageManager::remove (const OStorePageKey &rKey) } // Release page write access. - eErrCode = base::releasePage (aDescr, store_AccessReadWrite); + eErrCode = base::releasePage (aDescr); // Release and free directory page. eErrCode = base::free (aPage); @@ -1388,7 +1388,7 @@ storeError OStorePageManager::rebuild ( return eErrCode; // Initialize as 'Destination' with 'Source' page size. - eErrCode = self::initialize (pDstLB, store_AccessCreate, nPageSize); + eErrCode = self::initializeManager (pDstLB, store_AccessCreate, nPageSize); if (eErrCode != store_E_None) return eErrCode; |