ooo-build r11211 - in branches/sled-10-ooo-build-2-3: . patches patches/src680

[pmladek svn gnome org]

Author: pmladek
Date: Mon Jan  7 19:09:26 2008
New Revision: 11211
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11211&view=rev

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

	* Version 2.3.0.4.6
	
	* patches/src680/apply: enable sd-default-format-n285959.diff to apply



Modified:
   branches/sled-10-ooo-build-2-3/ChangeLog
   branches/sled-10-ooo-build-2-3/NEWS
   branches/sled-10-ooo-build-2-3/configure.in
   branches/sled-10-ooo-build-2-3/patches/Makefile.am
   branches/sled-10-ooo-build-2-3/patches/src680/apply

Modified: branches/sled-10-ooo-build-2-3/NEWS
==============================================================================
--- branches/sled-10-ooo-build-2-3/NEWS	(original)
+++ branches/sled-10-ooo-build-2-3/NEWS	Mon Jan  7 19:09:26 2008
@@ -1,3 +1,13 @@
+ooo-build-2.3.0.4.6
+
+    + features:
+	+ EMF+ import; disabled by default (Radek)
+    + VBA bits:
+	+ Application.Goto macro that includes _scroll:=True (Noel)
+    + bug fixes:
+	+ default formatting in PPT export (Hubert)
+	+ string-hash implementation fix (Michael)
+
 ooo-build-2.3.0.4.5
 
     + VBA bits:

Modified: branches/sled-10-ooo-build-2-3/configure.in
==============================================================================
--- branches/sled-10-ooo-build-2-3/configure.in	(original)
+++ branches/sled-10-ooo-build-2-3/configure.in	Mon Jan  7 19:09:26 2008
@@ -1,4 +1,4 @@
-AC_INIT(ooo-build, 2.3.0.4.5)
+AC_INIT(ooo-build, 2.3.0.4.6)
 AC_PREREQ(2.51)
 AC_CONFIG_SRCDIR(bin/build-ooo)
 AC_PREFIX_DEFAULT(/usr)
@@ -1116,6 +1116,7 @@
 patches/apply.pl
 patches/Makefile
 patches/cairo/Makefile
+patches/emf+/Makefile
 patches/evo2/Makefile
 patches/gstreamer/Makefile
 patches/hotfixes/Makefile

Modified: branches/sled-10-ooo-build-2-3/patches/Makefile.am
==============================================================================
--- branches/sled-10-ooo-build-2-3/patches/Makefile.am	(original)
+++ branches/sled-10-ooo-build-2-3/patches/Makefile.am	Mon Jan  7 19:09:26 2008
@@ -1,3 +1,3 @@
-SUBDIRS=64bit cairo evo2 gstreamer hotfixes mono ooxml scsolver src680 vba postgresql
+SUBDIRS=64bit cairo emf+ evo2 gstreamer hotfixes mono ooxml scsolver src680 vba postgresql
 
 EXTRA_DIST=README apply.pl.in $(wildcard *.diff)

Modified: branches/sled-10-ooo-build-2-3/patches/src680/apply
==============================================================================
--- branches/sled-10-ooo-build-2-3/patches/src680/apply	(original)
+++ branches/sled-10-ooo-build-2-3/patches/src680/apply	Mon Jan  7 19:09:26 2008
@@ -350,7 +350,7 @@
 sd-accept-uri-list-drop.diff, n#183719, rodo
 
 # default formatting PPT export bug n#285959
-# sd-default-format-n285959.diff, i#81395, n#285959, hub
+sd-default-format-n285959.diff, i#81395, n#285959, hub
 
 # more intelligent nsplugin seeking
 nsplugin-path.diff, i#49590, michael