ooo-build r11506 - in trunk: . patches/src680

[strba svn gnome org]

Author: strba
Date: Tue Feb  5 14:13:45 2008
New Revision: 11506
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11506&view=rev

Log:
2008-02-05  Thorsten Behrens  <tbehrens novell com>

	* patches/src680/transogl-transitions-officecfgs.diff: remove
	patches/src680/transogl-transitions-officecfg.diff: add
	* patches/src680/apply: Add extra transition config file for
	OGLTrans.



Added:
   trunk/patches/src680/transogl-transitions-officecfg.diff
      - copied, changed from r11504, /trunk/patches/src680/transogl-transitions-officecfgs.diff
Removed:
   trunk/patches/src680/transogl-transitions-officecfgs.diff
Modified:
   trunk/ChangeLog

Copied: trunk/patches/src680/transogl-transitions-officecfg.diff (from r11504, /trunk/patches/src680/transogl-transitions-officecfgs.diff)
==============================================================================
--- /trunk/patches/src680/transogl-transitions-officecfgs.diff	(original)
+++ trunk/patches/src680/transogl-transitions-officecfg.diff	Tue Feb  5 14:13:45 2008
@@ -1,5 +1,5 @@
-diff -rup ../src680-m237.orig/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu
---- ../src680-m237.orig/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu	2007-12-05 15:02:57.000000000 +0100
+officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu
+--- officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu	2007-12-05 15:02:57.000000000 +0100
 +++ officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu	2007-12-05 16:29:43.000000000 +0100
 @@ -1912,6 +1912,56 @@
 					
@@ -58,3 +58,14 @@
  		</node>
  	</node>	
  	<node oor:name="Presets">
+--- officecfg/registry/schema/org/openoffice/Office/Impress.xcs	18 Jan 2008 12:59:24 -0000	1.29.126.1
++++ officecfg/registry/schema/org/openoffice/Office/Impress.xcs	5 Feb 2008 01:00:49 -0000
+@@ -456,7 +456,7 @@
+ 					is allowed. </desc>
+ 					<label>List of files containing transition effects</label>
+ 				</info>
+-                <value oor:separator=";">vnd.sun.star.expand:$ORIGIN/../share/config/soffice.cfg/simpress/transitions.xml</value>
++                <value oor:separator=";">vnd.sun.star.expand:$ORIGIN/../share/config/soffice.cfg/simpress/transitions.xml;vnd.sun.star.expand:$ORIGIN/../share/config/soffice.cfg/simpress/transitions-ogl.xml</value>
+ 			</prop>
+ 			<prop oor:name="EffectFiles" oor:type="oor:string-list">
+ 				<!-- OldPath: -->