[ooo-build-commit] 2 commits - patches/dev300

[Thorsten Behrens]

 patches/dev300/apply                   |    6 ++
 patches/dev300/registry-speed-fix.diff |   72 +++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+), 1 deletion(-)

New commits:
commit 74b08765cc20b0fd55faecd0ec1e860ba7801b3e
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Tue Nov 24 10:32:35 2009 +0100

    Remove a bunch of useless flush calls in rdb code
    
    * patches/dev300/apply: added the patch
    * patches/dev300/registry-speed-fix.diff: remove a bunch of flush
      calls from idlc/regmerge; command fails anyway when trying to
      close the filehandle afterwards. Speeds up build in offapi etc.
      significantly

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 7706ad3..d3e74d7 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -285,6 +285,10 @@ writerfilter-qnametostr-NOOPTFILES.diff
 # this hack make sure that the object lives a bit longer
 sc-cellsuno-avoid-early-destruction.diff, i#90076, pmladek
 
+# don't flush after every key written, especially apparent during
+# idlc/regmerge runs in offapi build
+registry-speed-fix.diff, thorsten
+
 [ TemporaryHacks and not MacOSXOnly ]
 
 # don't lstat() that much while creating absolute URLs - breaks unopkg
diff --git a/patches/dev300/registry-speed-fix.diff b/patches/dev300/registry-speed-fix.diff
new file mode 100644
index 0000000..5e6b2a1
--- /dev/null
+++ b/patches/dev300/registry-speed-fix.diff
@@ -0,0 +1,72 @@
+--- registry/source/keyimpl.cxx~	2009-11-23 17:07:31.000000000 +0100
++++ registry/source/keyimpl.cxx	2009-11-23 21:47:24.718463289 +0100
+@@ -365,7 +365,6 @@
+         return REG_SET_VALUE_FAILED;
+     }
+ 
+-    rValue.flush();
+     rtl_freeMemory(pBuffer);
+     return REG_NO_ERROR;
+ }
+@@ -424,7 +423,6 @@
+         return REG_SET_VALUE_FAILED;
+     }
+ 
+-    rValue.flush();
+     rtl_freeMemory(pBuffer);
+     return REG_NO_ERROR;
+ }
+@@ -492,7 +490,6 @@
+         return REG_SET_VALUE_FAILED;
+     }
+ 
+-    rValue.flush();
+     rtl_freeMemory(pBuffer);
+     return REG_NO_ERROR;
+ }
+@@ -560,7 +557,6 @@
+         return REG_SET_VALUE_FAILED;
+     }
+ 
+-    rValue.flush();
+     rtl_freeMemory(pBuffer);
+     return REG_NO_ERROR;
+ }
+--- registry/source/regimpl.cxx~	2009-11-23 21:07:23.629214375 +0100
++++ registry/source/regimpl.cxx	2009-11-23 21:58:43.982214209 +0100
+@@ -851,7 +851,7 @@
+     {
+         return REG_DELETE_KEY_FAILED;
+     }
+-    sFile.flush();
++    //sFile.flush();
+ 
+     // set flag deleted !!!
+     ((ORegKey*)hOldKey)->setDeleted(sal_True);
+@@ -897,7 +897,7 @@
+             {
+                 return REG_DELETE_VALUE_FAILED;
+             }
+-        ((OStoreFile&)pKey->getStoreFile()).flush();
++	    //((OStoreFile&)pKey->getStoreFile()).flush();
+         }
+ 
+         _err = rStoreDir.next(iter);
+@@ -1068,7 +1068,7 @@
+     {
+         return REG_VALUE_NOT_EXISTS;
+     }
+-    pSourceKey->getStoreFile().flush();
++    //pSourceKey->getStoreFile().flush();
+ 
+     pBuffer = (sal_uInt8*)rtl_allocateMemory(VALUE_HEADERSIZE);
+ 
+@@ -1140,7 +1140,7 @@
+         rtl_freeMemory(pBuffer);
+         return REG_INVALID_VALUE;
+     }
+-    rTargetFile.flush();
++    //rTargetFile.flush();
+ 
+     if (rwBytes != nSize)
+     {
commit 5ba9cf4289343521d6fbee0b567a346b0489fbe1
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Mon Nov 23 12:31:29 2009 +0100

    Filed issue upstream, added bug id
    
    * patches/dev300/apply:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index a4d50e9..7706ad3 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2864,7 +2864,7 @@ cppcanvas-fix-roundcorners.diff, rodo
 officecfg-bighandles-default.diff, thorsten
 
 slideshow-cutblack.diff, thorsten
-canvas-colorspace-fix.diff, thorsten
+canvas-colorspace-fix.diff, i#107137, thorsten
 
 unoxml-boost-workaround.diff, thorsten