[ooo-build-commit] Branch 'ooo-build-3-1-1' - patches/dev300

[Thorsten Behrens]

 patches/dev300/store-core.diff |   17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

New commits:
commit 2953d9ac150d05f8774712294a792302bc15ade1
Author: Thorsten Behrens <thb at openoffice.org>
Date:   Wed Jan 13 21:47:37 2010 +0100

    Fix for upstream-incompatible types.rdb
    
    * patches/dev300/store-core.diff: fixed a few glitches in the store
      rework that prevents upstream reg tools to recognize them as valid
      rdb files. Fixes i#107877.

diff --git a/patches/dev300/store-core.diff b/patches/dev300/store-core.diff
index 534467d..a61d09a 100644
--- a/patches/dev300/store-core.diff
+++ b/patches/dev300/store-core.diff
@@ -1334,7 +1334,7 @@
 -			delete m_pData;
 -			m_pData = new(rDescr.m_nSize) data(rDescr.m_nSize);
 +			rtl_freeMemory (m_pData);
-+            m_pData = (data*) rtl_allocateMemory (m_aDescr.m_nSize);
++            m_pData = (data*) rtl_allocateMemory (rDescr.m_nSize);
  			m_aDescr.m_nSize = rDescr.m_nSize;
  		}
 -		__store_memcpy (m_pData, &rData, m_aDescr.m_nSize);
@@ -1368,6 +1368,15 @@
  	if (eErrCode != store_E_None)
  		STORE_METHOD_LEAVE(pMutex, eErrCode);
  
+@@ -547,7 +547,7 @@ storeError OStorePageCache::update (
+     {
+         // Save data.
+         storeError eErrCode = rBIOS.write (
+-            rDescr.m_nAddr, &rData, rDescr.m_nSize);
++            rDescr.m_nAddr, rData.Data (), rDescr.m_nSize);
+         if (eErrCode != store_E_None)
+             STORE_METHOD_LEAVE(pMutex, eErrCode);
+         m_nWrtBack++;
 @@ -576,7 +576,7 @@ storeError OStorePageCache::update (
  				m_pHead->dirty();
  
@@ -3775,9 +3784,9 @@
 -	base::m_aGuard.m_nMagic = STORE_MAGIC_BTREENODE;
 -	base::m_aDescr.m_nUsed  = base::size() + self::size();
 -	self::m_aGuard.m_nMagic = 0;
-+	base::PageHeader ().m_aGuard.m_nMagic = STORE_MAGIC_BTREENODE;
-+	base::PageHeader ().m_aDescr.m_nUsed  = base::size() + self::size();
-+	self::PageHeader ().m_aGuard.m_nMagic = 0;
++	base::PageHeader  ().m_aGuard.m_nMagic = STORE_MAGIC_BTREENODE;
++	base::PageHeader  ().m_aDescr.m_nUsed  = base::size() + self::size();
++	DataRepresentation().m_aGuard.m_nMagic = 0;
  
  	sal_uInt16 i, n = capacityCount();
  	T          t;