[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/apply            |    9 +++++++--
 patches/dev300/speed-store.diff |    7 +++----
 2 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 04937b6da9023bb8bfc402915bc6e993caa51375
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Aug 12 16:54:38 2009 +0300

    Adapt Store set to dev300-m54
    
    * patches/dev300/speed-store.diff: Adapt for dev300-m54.
    * patches/dev300/apply: Comment out store-core.diff and
      speed-store-lck.diff for now.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 9f8b186..1d3fcd3 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2280,15 +2280,20 @@ gstreamer-sd.diff, i#68717, rodo
 [ Store ]
 SectionOwner => rodo
 SectionIssue => i#75399
-store-core.diff
+
+# FIXME: 2009-08-12: Does not apply at all. --tml
+# store-core.diff
+
 store-install.diff
 
 store-registry.diff
 
 # don't burn 3% of startup doing CRC's we don't need
 speed-store.diff, i#78495, michael
+
 # don't do a load of locking we don't need to 1% of startup
-speed-store-lck.diff, i#78526, michael
+# FIXME: 2009-08-12: Does not apply at all. --tml
+# speed-store-lck.diff, i#78526, michael
 
 [ WMF ]
 wmf-pattern-brush.diff, n#232232, rodo
diff --git a/patches/dev300/speed-store.diff b/patches/dev300/speed-store.diff
index 475fea5..3a2ffc4 100644
--- a/patches/dev300/speed-store.diff
+++ b/patches/dev300/speed-store.diff
@@ -20,7 +20,6 @@ diff -u -r ../HEAD/build/src680-m211/store/source/stordata.hxx store/source/stor
  		sal_uInt32 nCRC32 = 0;
  		nCRC32 = G::crc32 (nCRC32, &DataRepresentation ().m_aGuard.m_nMagic, sizeof(sal_uInt32));
  		nCRC32 = G::crc32 (nCRC32, DataRepresentation ().m_pData, capacity(rDescr));
-diff -u -r ../HEAD/build/src680-m211/store/source/stortree.cxx store/source/stortree.cxx
 --- store/source/stortree.cxx
 +++ store/source/stortree.cxx
 @@ -253,6 +253,8 @@
@@ -29,6 +28,6 @@ diff -u -r ../HEAD/build/src680-m211/store/source/stortree.cxx store/source/stor
  {
 +    return store_E_None;
 +
- 	storeError eErrCode = base::verify (rDescr);
- 	if (eErrCode != store_E_None)
- 		return eErrCode;
+ 	return PageHolderObject< page >::verify (m_xPage, nAddr);
+ }
+