Fixed one more issue which exposed itself only on 32bit systems

1 files changed, 21 insertions, 19 deletions

diff --git a/patches/test/store-core.diff b/patches/test/store-core.diff
index d03ea2044..b72be453a 100644
--- a/patches/test/store-core.diff
+++ b/patches/test/store-core.diff
@@ -51,7 +51,7 @@ diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/makefi
 Only in store/source: makefile.mk.orig
 diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/storbase.cxx store/source/storbase.cxx
 --- /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/storbase.cxx	2006-09-17 03:11:51.000000000 +0200
-+++ store/source/storbase.cxx	2007-03-08 20:11:06.000000000 +0100
++++ store/source/storbase.cxx	2007-03-09 18:29:50.000000000 +0100
 @@ -56,6 +56,9 @@
  #ifndef _RTL_REF_HXX_
  #include <rtl/ref.hxx>
@@ -194,16 +194,17 @@ diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/storba
  		if (eErrCode == store_E_None)
  		{
  			// Ok. Replace 1st copy with 2nd copy.
-@@ -1495,7 +1526,7 @@ storeError OStorePageBIOS::allocate (
+@@ -1495,7 +1526,8 @@ storeError OStorePageBIOS::allocate (
  		if (aListHead.m_nAddr)
  		{
  			// Allocate from FreeList.
 -			OStorePageData aPageHead (OStorePageData::size());
-+			OStorePageData aPageHead (OStorePageData::size(), sizeof (OStorePageData));
++            sal_uInt8 aPageHeadData [OStorePageData::size()];
++			OStorePageData aPageHead (OStorePageData::size(), sizeof (OStorePageData), aPageHeadData);
  			aPageHead.location (aListHead.m_nAddr);
  
  			// Load PageHead.
-@@ -1508,9 +1539,9 @@ storeError OStorePageBIOS::allocate (
+@@ -1508,9 +1540,9 @@ storeError OStorePageBIOS::allocate (
  
  			// Verify FreeList head.
  			OSL_PRECOND(
@@ -215,7 +216,7 @@ diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/storba
  			{
  				// Recovery: Reset FreeList.
  				m_pSuper->m_aSuperTwo.unusedReset();
-@@ -1531,11 +1562,11 @@ storeError OStorePageBIOS::allocate (
+@@ -1531,11 +1563,11 @@ storeError OStorePageBIOS::allocate (
  
  			// Assign location.
  			OStorePageData &rData = rPage.getData();
@@ -230,7 +231,7 @@ diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/storba
  
  			// Save page.
  			eErrCode = poke (rPage);
-@@ -1669,8 +1700,8 @@ storeError OStorePageBIOS::free (OStoreP
+@@ -1669,8 +1701,8 @@ storeError OStorePageBIOS::free (OStoreP
  	// Push onto FreeList.
  	OStorePageLink aListHead (m_pSuper->m_aSuperTwo.unusedHead());
  
@@ -241,7 +242,7 @@ diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/storba
  
  	// Save PageHead.
  	eErrCode = poke (rData);
-@@ -1708,14 +1739,14 @@ storeError OStorePageBIOS::load (OStoreP
+@@ -1708,14 +1740,14 @@ storeError OStorePageBIOS::load (OStoreP
  
  	// Save PageDescriptor.
  	OStorePageData       &rData = rPage.getData();
@@ -259,7 +260,7 @@ diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/storba
  		return eErrCode;
  	}
  
-@@ -1724,7 +1755,7 @@ storeError OStorePageBIOS::load (OStoreP
+@@ -1724,7 +1756,7 @@ storeError OStorePageBIOS::load (OStoreP
  	if (eErrCode != store_E_None)
  	{
  		// Restore PageDescriptor.
@@ -268,7 +269,7 @@ diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/storba
  		return eErrCode;
  	}
  
-@@ -1734,8 +1765,8 @@ storeError OStorePageBIOS::load (OStoreP
+@@ -1734,8 +1766,8 @@ storeError OStorePageBIOS::load (OStoreP
  #endif /* OSL_BIGENDIAN */
  
  	// Verify PageDescriptor.
@@ -279,7 +280,7 @@ diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/storba
  		return store_E_InvalidAccess;
  
  	// Mark page as clean.
-@@ -1928,7 +1959,7 @@ storeError OStorePageBIOS::scanNext (
+@@ -1928,7 +1960,7 @@ storeError OStorePageBIOS::scanNext (
  		return store_E_InvalidAccess;
  
  	// Setup PageHead.
@@ -288,7 +289,7 @@ diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/storba
  
  	// Check context.
  	while (rCtx.isValid())
-@@ -1943,11 +1974,11 @@ storeError OStorePageBIOS::scanNext (
+@@ -1943,11 +1975,11 @@ storeError OStorePageBIOS::scanNext (
  			continue;
  
  		// Check PageHead Magic number.
@@ -302,7 +303,7 @@ diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/storba
  			continue;
  
  		// Load page.
-@@ -1971,14 +2002,14 @@ storeError OStorePageBIOS::scanNext (
+@@ -1971,14 +2003,14 @@ storeError OStorePageBIOS::scanNext (
  storeError OStorePageBIOS::peek (OStorePageData &rData)
  {
  	// Save PageDescriptor.
@@ -320,7 +321,7 @@ diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/storba
  		return eErrCode;
  	}
  
-@@ -1987,7 +2018,7 @@ storeError OStorePageBIOS::peek (OStoreP
+@@ -1987,7 +2019,7 @@ storeError OStorePageBIOS::peek (OStoreP
  	if (eErrCode != store_E_None)
  	{
  		// Restore PageDescriptor.
@@ -329,7 +330,7 @@ diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/storba
  		return eErrCode;
  	}
  
-@@ -1997,8 +2028,8 @@ storeError OStorePageBIOS::peek (OStoreP
+@@ -1997,8 +2029,8 @@ storeError OStorePageBIOS::peek (OStoreP
  #endif /* OSL_BIGENDIAN */
  
  	// Verify PageDescriptor.
@@ -340,7 +341,7 @@ diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/storba
  		return store_E_InvalidAccess;
  	else
  		return store_E_None;
-@@ -2011,7 +2042,7 @@ storeError OStorePageBIOS::peek (OStoreP
+@@ -2011,7 +2043,7 @@ storeError OStorePageBIOS::peek (OStoreP
  storeError OStorePageBIOS::poke (OStorePageData &rData)
  {
  	// Save PageDescriptor.
@@ -349,7 +350,7 @@ diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/storba
  
  #ifdef OSL_BIGENDIAN
  	// Swap to external representation.
-@@ -2022,7 +2053,7 @@ storeError OStorePageBIOS::poke (OStoreP
+@@ -2022,7 +2054,7 @@ storeError OStorePageBIOS::poke (OStoreP
  	rData.guard ();
  
  	// Write PageHead.
@@ -358,7 +359,7 @@ diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/storba
  
  #ifdef OSL_BIGENDIAN
  	// Swap back to internal representation.
-@@ -2041,7 +2072,7 @@ storeError OStorePageBIOS::poke (OStoreP
+@@ -2041,7 +2073,7 @@ storeError OStorePageBIOS::poke (OStoreP
  {
  	// Save PageDescriptor.
  	OStorePageData       &rData = rPage.getData();
@@ -367,7 +368,7 @@ diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/storba
  
  #ifdef OSL_BIGENDIAN
  	// Swap to external representation.
-@@ -2052,7 +2083,7 @@ storeError OStorePageBIOS::poke (OStoreP
+@@ -2052,7 +2084,7 @@ storeError OStorePageBIOS::poke (OStoreP
  	rPage.guard (aDescr);
  
  	// Write page.
@@ -376,7 +377,7 @@ diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/storba
  
  #ifdef OSL_BIGENDIAN
  	// Swap back to internal representation.
-@@ -2067,3 +2098,176 @@ storeError OStorePageBIOS::poke (OStoreP
+@@ -2067,3 +2099,176 @@ storeError OStorePageBIOS::poke (OStoreP
  	return eErrCode;
  }
  
@@ -3859,6 +3860,7 @@ diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/stortr
  
  	/** queryMerge.
 Only in store: TAGS
+Only in store: unxlngx6.pro
 diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/workben/makefile.mk store/workben/makefile.mk
 --- /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/workben/makefile.mk	2005-09-08 10:49:17.000000000 +0200
 +++ store/workben/makefile.mk	2007-02-28 22:58:41.000000000 +0100