diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-02-28 09:32:53 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-02-28 09:32:53 +0000 |
| commit | eddd9371d18705cce623e8dfc7c923f53b650de7 (patch) | |
| tree | 268a6115f442b4e0334c3a03b7f94c284c2a6992 /store | |
| parent | 78b609d1aabbfdec0aa7ec5f247e92f66229fe0d (diff) | |
INTEGRATION: CWS sixtyfour01 (1.4.12); FILE MERGED
2006/01/14 12:48:36 pjanik 1.4.12.1: #i57737#: 64bit fixes for module store. Patch from Jan Holesovsky (JCA).
Diffstat (limited to 'store')
| -rw-r--r-- | store/source/storpage.cxx | 6 | ||||
| -rw-r--r-- | store/source/stortree.cxx | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/store/source/storpage.cxx b/store/source/storpage.cxx index d23238dcd3cb..8925e0f0fbc4 100644 --- a/store/source/storpage.cxx +++ b/store/source/storpage.cxx @@ -4,9 +4,9 @@ * * $RCSfile: storpage.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-08 08:47:20 $ + * last change: $Author: kz $ $Date: 2006-02-28 10:32:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -968,7 +968,7 @@ storeError OStorePageManager::symlink ( // Mark 'Source' as symbolic link to 'Destination'. OStoreDirectoryPageObject aPage (*m_pDirect); aPage.attrib (STORE_ATTRIB_ISLINK); - aPage.dataLength (sizeof (aDstKey)); + aPage.dataLength (sal_uInt32(sizeof(aDstKey))); // Allocate and save 'Source' directory page. eErrCode = base::allocate (aPage); diff --git a/store/source/stortree.cxx b/store/source/stortree.cxx index d70cfbbdc7b3..42e8b25c08b1 100644 --- a/store/source/stortree.cxx +++ b/store/source/stortree.cxx @@ -4,9 +4,9 @@ * * $RCSfile: stortree.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-08 08:48:06 $ + * last change: $Author: kz $ $Date: 2006-02-28 10:32:53 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -33,7 +33,7 @@ * ************************************************************************/ -#define _STORE_STORTREE_CXX "$Revision: 1.4 $" +#define _STORE_STORTREE_CXX "$Revision: 1.5 $" #ifndef _SAL_TYPES_H_ #include <sal/types.h> @@ -104,7 +104,7 @@ void OStoreBTreeNodeData::swap (const D& rDescr) #ifdef OSL_BIGENDIAN m_aGuard.swap(); - sal_uInt16 i, n = capacity(rDescr) / sizeof(T); + sal_uInt16 i, n = sal_uInt16(capacity(rDescr) / sizeof(T)); for (i = 0; i < n; i++) m_pData[i].swap(); #endif /* OSL_BIGENDIAN */ @@ -151,7 +151,7 @@ void OStoreBTreeNodeData::insert (sal_uInt16 i, const T& t) // insert. m_pData[i] = t; - base::m_aDescr.m_nUsed += sizeof(T); + base::m_aDescr.m_nUsed += sal_uInt16(sizeof(T)); } } @@ -169,7 +169,7 @@ void OStoreBTreeNodeData::remove (sal_uInt16 i) // truncate. m_pData[n - 1] = T(); - base::m_aDescr.m_nUsed -= sizeof(T); + base::m_aDescr.m_nUsed -= sal_uInt16(sizeof(T)); } } |