ooo-build r13246 - trunk/patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Wed Jul 16 12:23:22 2008
New Revision: 13246
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13246&view=rev

Log:
revert r13245

Removed:
   trunk/patches/dev300/store-registry-m23.diff
Modified:
   trunk/patches/dev300/apply
   trunk/patches/dev300/store-registry.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Jul 16 12:23:22 2008
@@ -64,7 +64,7 @@
 SUSE-reduced:NovellBase,BerkeleyDB43, ReducedDefaults
 # Debian
 DebianBase : LinuxCommon, DebianBaseOnly, Lockdown, GCCSTL, BerkeleyDB43, Split, PostgreSQL
-Debian : DebianBase, DebianOnly, DebianSidOnly, Debian32Only, CairoFonts, Gcc43, EMFPlus
+Debian : DebianBase, DebianOnly, DebianSidOnly, Debian32Only, CairoFonts, Gcc43
 DebianEtch : DebianBase, DebianOnly, DebianEtchOnly, Debian32Only
 # Ubuntu
 UbuntuBased : DebianBase, UbuntuOnly
@@ -2015,9 +2015,6 @@
 [ Store <= dev300-m21 ]
 store-registry-m21.diff
 
-[ Store >= dev300-m22 < beb300-m0 <= dev300-m23 ]
-store-registry-m23.diff
-
 [ Store >= dev300-m22 < beb300-m0 ]
 store-registry.diff
 

Modified: trunk/patches/dev300/store-registry.diff
==============================================================================
--- trunk/patches/dev300/store-registry.diff	(original)
+++ trunk/patches/dev300/store-registry.diff	Wed Jul 16 12:23:22 2008
@@ -3,7 +3,7 @@
 @@ -410,7 +410,7 @@ RegError REGISTRY_CALLTYPE reg_mergeKey(
  	@return	REG_NO_ERROR if succeeds else an error code. 
  */
- RegError REGISTRY_CALLTYPE SAL_DLLPUBLIC_EXPORT reg_createRegistry(rtl_uString* registryName, 
+ RegError REGISTRY_CALLTYPE reg_createRegistry(rtl_uString* registryName, 
 -							 				  RegHandle* phRegistry);
 +							 				  RegHandle* phRegistry, bool bInternal = false);