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

[pmladek svn gnome org]

Author: pmladek
Date: Wed Jan  7 18:44:46 2009
New Revision: 15020
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15020&view=rev

Log:
2009-01-07  Petr Mladek  <pmladek suse cz>

	* patches/dev300/cws-fix30autorecovery.diff, patches/dev300/apply:
	  autorecovery does not recover the previously auto-saved document
	  version, but the last one which was regularly saved; fix backported
	  from OOo-3.0.1 (i#92968)



Added:
   branches/ooo-build-3-0/patches/dev300/cws-fix30autorecovery.diff
Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/NEWS
   branches/ooo-build-3-0/patches/dev300/apply

Modified: branches/ooo-build-3-0/NEWS
==============================================================================
--- branches/ooo-build-3-0/NEWS	(original)
+++ branches/ooo-build-3-0/NEWS	Wed Jan  7 18:44:46 2009
@@ -20,7 +20,6 @@
 	+ Range.Select and window focus (bnc#444156) [Noel]
 	+ commandbar submenu fix (bnc#434214, bnc#437157) [Fong]
 	+ Worksheet_Activate before the sheet is changed (bnc#444145) [Noel]
-#	+ locale dependant R1C1 formula conversion (bnc#422145) [Kohei]
     + Win32 bits:
 	+ fix MSI patchability [Tor]
 	+ build with older boost [Thorsten]

Modified: branches/ooo-build-3-0/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0/patches/dev300/apply	Wed Jan  7 18:44:46 2009
@@ -309,6 +309,8 @@
 #basic runtime fixes
 basic-add-missing-includes-after-cws-npower10.diff
 
+cws-fix30autorecovery.diff, i#92968
+
 cws-pflin10.diff
 #api changes
 cws-npower11.diff

Added: branches/ooo-build-3-0/patches/dev300/cws-fix30autorecovery.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0/patches/dev300/cws-fix30autorecovery.diff	Wed Jan  7 18:44:46 2009
@@ -0,0 +1,48 @@
+Index: comphelper/source/misc/mediadescriptor.cxx
+===================================================================
+RCS file: /cvs/util/comphelper/source/misc/mediadescriptor.cxx,v
+retrieving revision 1.20
+retrieving revision 1.20.36.1
+diff -u -p -u -p -b -w -B -r1.20 -r1.20.36.1
+--- comphelper/source/misc/mediadescriptor.cxx	6 Jun 2008 14:36:10 -0000	1.20
++++ comphelper/source/misc/mediadescriptor.cxx	28 Oct 2008 20:23:19 -0000	1.20.36.1
+@@ -524,18 +524,15 @@ sal_Bool MediaDescriptor::addInputStream
+ 			return impl_openStreamWithPostData( xPostData );
+ 		}
+ 
+-        // b) is there a reference to a file which is just being salvaged?
+-        ::rtl::OUString sFileURL = getUnpackedValueOrDefault(MediaDescriptor::PROP_SALVAGEDFILE(), ::rtl::OUString());
+-		// c) finally, the last resort is the URL property
+-        if ( !sFileURL.getLength() )
+-            sFileURL = getUnpackedValueOrDefault(MediaDescriptor::PROP_URL(), ::rtl::OUString());
+-		if (!sFileURL.getLength())
++		// b) ... or we must get it from the given URL
++		::rtl::OUString sURL = getUnpackedValueOrDefault(MediaDescriptor::PROP_URL(), ::rtl::OUString());
++		if (!sURL.getLength())
+ 			throw css::uno::Exception(
+ 					::rtl::OUString::createFromAscii("Found no URL."),
+ 					css::uno::Reference< css::uno::XInterface >());
+ 
+         // Parse URL! Only the main part has to be used further. E.g. a jumpmark can make trouble
+-        ::rtl::OUString sNormalizedURL = impl_normalizeURL( sFileURL );
++        ::rtl::OUString sNormalizedURL = impl_normalizeURL( sURL );
+ 		return impl_openStreamWithURL( sNormalizedURL, bLockFile );
+ 	}
+ #if OSL_DEBUG_LEVEL>0
+Index: scp2/source/ooo/file_library_ooo.scp
+===================================================================
+RCS file: /cvs/installation/scp2/source/ooo/file_library_ooo.scp,v
+retrieving revision 1.303.2.3
+retrieving revision 1.303.2.3.20.1
+diff -u -p -u -p -b -w -B -r1.303.2.3 -r1.303.2.3.20.1
+--- scp2/source/ooo/file_library_ooo.scp	21 Oct 2008 13:18:37 -0000	1.303.2.3
++++ scp2/source/ooo/file_library_ooo.scp	3 Nov 2008 13:59:35 -0000	1.303.2.3.20.1
+@@ -200,7 +200,7 @@ File gid_File_Lib_Comphelper2
+     Name = STRING(CONCAT3(comphelp4,COMID,.dll));
+   #endif
+     Dir = gid_Dir_Program;
+-    Styles = (PACKED,UNO_COMPONENT);
++    Styles = (PACKED,UNO_COMPONENT,PATCH);
+     RegistryID = gid_Starregistry_Services_Rdb;
+ End
+