From d76cdb914c2342f9d0bbff37e02d9eb1d06b48dc Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Mon, 19 Jun 2006 23:33:22 +0000
Subject: INTEGRATION: CWS warnings01 (1.2.136); FILE MERGED 2006/04/07
 20:02:05 sb 1.2.136.4: RESYNC: (1.3-1.4); FILE MERGED 2005/11/21 09:15:28 sb
 1.2.136.3: #i53898# Made code warning-free. 2005/09/22 21:58:16 sb 1.2.136.2:
 RESYNC: (1.2-1.3); FILE MERGED 2005/09/02 16:30:32 sb 1.2.136.1: #i53898#
 Made code warning-free.

---
 store/source/stordata.hxx | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'store')

diff --git a/store/source/stordata.hxx b/store/source/stordata.hxx
index a92f2df23bbb..5f816954cfae 100644
--- a/store/source/stordata.hxx
+++ b/store/source/stordata.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: stordata.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: kz $ $Date: 2006-02-28 10:32:11 $
+ *  last change: $Author: hr $ $Date: 2006-06-20 00:33:22 $
  *
  *  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_STORDATA_HXX_
-#define _STORE_STORDATA_HXX_ "$Revision: 1.4 $"
+#define _STORE_STORDATA_HXX_ "$Revision: 1.5 $"
 
 #ifndef _SAL_TYPES_H_
 #include <sal/types.h>
@@ -116,7 +116,8 @@ struct OStoreDataPageData : public store::OStorePageData
     void initialize (void)
     {
         base::m_aGuard.m_nMagic = STORE_MAGIC_DATAPAGE;
-        base::m_aDescr.m_nUsed += self::size();
+        base::m_aDescr.m_nUsed = sal::static_int_cast< sal_uInt16 >(
+            base::m_aDescr.m_nUsed + self::size());
         rtl_zeroMemory (m_pData, capacity());
     }
 
@@ -640,7 +641,8 @@ struct OStoreDirectoryPageData : public store::OStorePageData
         : base (nPageSize)
     {
         base::m_aGuard.m_nMagic = STORE_MAGIC_DIRECTORYPAGE;
-        base::m_aDescr.m_nUsed += self::size();
+        base::m_aDescr.m_nUsed = sal::static_int_cast< sal_uInt16 >(
+            base::m_aDescr.m_nUsed + self::size());
         rtl_zeroMemory (m_pData, capacity());
     }
 
@@ -655,7 +657,7 @@ struct OStoreDirectoryPageData : public store::OStorePageData
 
     /** swap (internal and external representation).
     */
-    void swap (const D& rDescr)
+    void swap ()
     {
 #ifdef OSL_BIGENDIAN
         m_aNameBlock.swap();
@@ -665,7 +667,7 @@ struct OStoreDirectoryPageData : public store::OStorePageData
 
     /** guard (external representation).
     */
-    void guard (const D& rDescr)
+    void guard ()
     {
         m_aNameBlock.guard();
         m_aDataBlock.guard();
@@ -673,7 +675,7 @@ struct OStoreDirectoryPageData : public store::OStorePageData
 
     /** verify (external representation).
     */
-    storeError verify (const D& rDescr)
+    storeError verify ()
     {
         storeError eErrCode = m_aNameBlock.verify();
         if (eErrCode == store_E_None)
-- 
cgit