ooo-build r14842 - in branches/ooo-build-3-0-1: . patches/dev300

[pmladek svn gnome org]

Author: pmladek
Date: Fri Dec 12 21:19:55 2008
New Revision: 14842
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14842&view=rev

Log:
2008-12-12  Michael Meeks  <michael meeks novell com>

	* patches/dev300/speed-registry-links.diff,
	* patches/dev300/apply: don't spend ages looking for symlinks
	that are not there in various registries; backport from trunk



Added:
   branches/ooo-build-3-0-1/patches/dev300/speed-registry-links.diff
Modified:
   branches/ooo-build-3-0-1/ChangeLog
   branches/ooo-build-3-0-1/patches/dev300/apply

Modified: branches/ooo-build-3-0-1/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0-1/patches/dev300/apply	Fri Dec 12 21:19:55 2008
@@ -2024,6 +2024,8 @@
 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
+# don't burn CPU cycles lookup links that are not there
+speed-registry-links.diff, i#96284, michael
 
 
 [ WMF ]

Added: branches/ooo-build-3-0-1/patches/dev300/speed-registry-links.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0-1/patches/dev300/speed-registry-links.diff	Fri Dec 12 21:19:55 2008
@@ -0,0 +1,22 @@
+Index: source/regimpl.cxx
+===================================================================
+RCS file: /cvs/udk/registry/source/regimpl.cxx,v
+retrieving revision 1.28
+diff -u -p -r1.28 regimpl.cxx
+--- registry/source/regimpl.cxx  11 Apr 2008 10:49:44 -0000      1.28
++++ registry/source/regimpl.cxx  31 Oct 2008 12:37:17 -0000
+@@ -2168,6 +2174,14 @@ OUString ORegistry::resolveLinks(ORegKey
+     if ( path.getStr()[0] == '/' )
+         nIndex++;
+ 
++    // there are no symlinks in any registries we read these days ...
++    OUString hack = resolvedPath;
++    if (resolvedPath.getLength() <= 1)
++      hack = OUString();
++    hack += rtl::OUString::createFromAscii("/");
++    hack += path.copy(nIndex);
++    return hack;
++
+     do
+     {
+         token = path.getToken( 0, '/', nIndex );