summaryrefslogtreecommitdiff
path: root/store
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 23:34:18 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 23:34:18 +0000
commitf5b7e4e876f4b32934c728489f67add31c784f33 (patch)
treeca49c3d3fb31aff506cc08aedf55a7cb97123275 /store
parent95661458fcf77ddf15148b81e747d74dbd2e9e71 (diff)
INTEGRATION: CWS warnings01 (1.3.92); FILE MERGED
2005/09/22 21:59:04 sb 1.3.92.3: RESYNC: (1.3-1.4); FILE MERGED 2005/09/05 07:48:21 sb 1.3.92.2: #i53898# Improved previous modification. 2005/09/02 16:30:33 sb 1.3.92.1: #i53898# Made code warning-free.
Diffstat (limited to 'store')
-rw-r--r--store/source/storpage.hxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/store/source/storpage.hxx b/store/source/storpage.hxx
index d8b3d651e..3499af144 100644
--- a/store/source/storpage.hxx
+++ b/store/source/storpage.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: storpage.hxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: rt $ $Date: 2005-09-08 08:47:42 $
+ * last change: $Author: hr $ $Date: 2006-06-20 00:34:18 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -34,7 +34,7 @@
************************************************************************/
#ifndef _STORE_STORPAGE_HXX_
-#define _STORE_STORPAGE_HXX_ "$Revision: 1.4 $"
+#define _STORE_STORPAGE_HXX_ "$Revision: 1.5 $"
#ifndef _SAL_TYPES_H_
#include <sal/types.h>
@@ -78,10 +78,10 @@ public:
/** Initialization (two-phase construction).
*/
- virtual storeError initialize (
+ storeError initializeManager (
ILockBytes *pLockBytes,
storeAccessMode eAccessMode,
- sal_uInt16 nPageSize = STORE_DEFAULT_PAGESIZE);
+ sal_uInt16 nPageSize);
/** isValid.
* @return sal_True upon successful initialization,
@@ -190,8 +190,8 @@ private:
/** IStoreHandle query() template function specialization.
*/
- friend inline OStorePageManager*
- SAL_CALL query (IStoreHandle *pHandle, OStorePageManager*);
+ friend OStorePageManager*
+ SAL_CALL query<> (IStoreHandle *pHandle, OStorePageManager*);
/** Representation.
*/
@@ -228,7 +228,7 @@ inline sal_Bool OStorePageManager::isValid (void) const
return (base::isValid() && (m_nPageSize > 0));
}
-inline OStorePageManager*
+template<> inline OStorePageManager*
SAL_CALL query (IStoreHandle *pHandle, OStorePageManager*)
{
if (pHandle && pHandle->isKindOf (OStorePageManager::m_nTypeId))