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

[pmladek svn gnome org]

Author: pmladek
Date: Thu Jan  8 16:59:55 2009
New Revision: 15036
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15036&view=rev

Log:
2008-01-08  Petr Mladek  <pmladek suse cz>

	* patches/dev300/webdav-locking-from-ooo-build-2-4-1.diff:
	* ooo-build/patches/dev300/apply: port for ooo300-m14 and enable again



Modified:
   branches/ooo-build-3-0-1/ChangeLog
   branches/ooo-build-3-0-1/NEWS
   branches/ooo-build-3-0-1/patches/dev300/apply
   branches/ooo-build-3-0-1/patches/dev300/webdav-locking-from-ooo-build-2-4-1.diff

Modified: branches/ooo-build-3-0-1/NEWS
==============================================================================
--- branches/ooo-build-3-0-1/NEWS	(original)
+++ branches/ooo-build-3-0-1/NEWS	Thu Jan  8 16:59:55 2009
@@ -1,3 +1,32 @@
+ooo-build-3.0.0.99.2:
+
+    +features:
+	+ support ooo300-m14 (3.0.1rc1) [Rene, Petr, Tor]
+	+ WordPro import filter [Fong]
+    + speed up:
+	+ symlinks in registries [Michael]
+    + bug fixes:
+	+ bin upstream specific updater code [Kohei]
+	+ incorrect scaling of axes (i#95714) [Kohei]
+	+ incorrect scaling of axes (i#95714) [Kohei]
+	+ pivot cache field import (bnc#433658) [Kohei]
+	+ store ranges using CONV_OOO (bnc#463305) [Kohei]
+	+ cell change records export to Excel (bnc#416045) [Kohei]
+	+ selected and unselected tab colors (bnc#396386, i#94452) [Kohei]
+	+ outline numbering in master document (i#96092, bnc#445536) [Amelia]
+	+ truncated text on buttons on sslwarndlg (i#97329) [Andras]
+	+ PDF export from page preview crasher (i#96167) [Chris]
+	+ fit list to size popup (i#94086) [Thorsten]
+    + VBA bits:
+	+ XLS import crasher (bnc#458985) [Noel]
+    + Win32 bits:
+	+ drop support for Win9x [Tor]
+    + build bits:
+	+ build with boost-1.37 [Bernhard]
+	+ GIO vs. GNOME VFS (i#95713) [Petr]
+	+ prebuilt mono dlls update [Petr]
+    + updated OxygenOffice bits [KAMI]
+
 ooo-build-3.0.0.99.1:
 
     +features:

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	Thu Jan  8 16:59:55 2009
@@ -531,13 +531,13 @@
 cws-webdavandgvfslocking1-ucb.diff
 cws-webdavandgvfslocking1-unotools.diff
 
-[ WebDAV == ooo300-m12 ]
+[ WebDAV > ooo300-m13 ]
 SectionOwner => jholesov
 SectionIssue => i#29152
 # WebDAV locking implementation - the original version
 # This is forward-ported from ooo-build-2-4-1, because the version for
 # up-streaming still does not work as expected :-(
-#FIXME m14 webdav-locking-from-ooo-build-2-4-1.diff
+webdav-locking-from-ooo-build-2-4-1.diff
 
 [ WebDAV == ooo300-m13 ]
 SectionOwner => jholesov

Modified: branches/ooo-build-3-0-1/patches/dev300/webdav-locking-from-ooo-build-2-4-1.diff
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/webdav-locking-from-ooo-build-2-4-1.diff	(original)
+++ branches/ooo-build-3-0-1/patches/dev300/webdav-locking-from-ooo-build-2-4-1.diff	Thu Jan  8 16:59:55 2009
@@ -206,15 +206,6 @@
  	  && ::utl::UCBContentHelper::IsDocument( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ) );
  }
  
-@@ -892,7 +915,7 @@ uno::Reference < embed::XStorage > SfxMedium::GetOutputStorage()
- 
-     // medium based on OutputStream: must work with TempFile
-     if( aLogicName.CompareToAscii( "private:stream", 14 ) == COMPARE_EQUAL
--	  || !::utl::LocalFileHelper::IsLocalFile( aLogicName ) )
-+            || !SupportsActiveStreaming( aLogicName ) )
-         CreateTempFileNoCopy();
- 	// if Medium already contains a stream - TODO/LATER: store stream/outputstream in ImplData, not in Medium
- 	else if ( GetItemSet()->GetItemState( SID_STREAM ) < SFX_ITEM_SET )
 @@ -1165,7 +1188,7 @@ uno::Reference < embed::XStorage > SfxMedium::GetStorage()
  
              try