ooo-build r15218 - in trunk: . patches/dev300

[kyoshida svn gnome org]

Author: kyoshida
Date: Wed Jan 28 17:06:36 2009
New Revision: 15218
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15218&view=rev

Log:
2009-01-28  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/linkwarn-officecfg-disable-msgbox-m39.diff:
	* patches/dev300/linkwarn-officecfg-disable-msgbox.diff:
	* patches/dev300/apply: adjusted for dev300-m40.



Added:
   trunk/patches/dev300/linkwarn-officecfg-disable-msgbox-m39.diff   (props changed)
      - copied unchanged from r15215, /trunk/patches/dev300/linkwarn-officecfg-disable-msgbox.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/linkwarn-officecfg-disable-msgbox.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Jan 28 17:06:36 2009
@@ -2880,7 +2880,13 @@
 
 linkwarn-svtools-miscopts-bits.diff, n#348149, thorsten
 
+[ LinkWarningDlg <= dev300-m39 ]
+linkwarn-officecfg-disable-msgbox-m39.diff, n#348149, thorsten
+
+[ LinkWarningDlg > dev300-m39 ]
 linkwarn-officecfg-disable-msgbox.diff, n#348149, thorsten
+
+[ LinkWarningDlg ]
 linkwarn-svx-warning-dlg.diff, n#348149, thorsten
 linkwarn-sd-no-dnd-links.diff, n#348149, thorsten
 

Modified: trunk/patches/dev300/linkwarn-officecfg-disable-msgbox.diff
==============================================================================
--- trunk/patches/dev300/linkwarn-officecfg-disable-msgbox.diff	(original)
+++ trunk/patches/dev300/linkwarn-officecfg-disable-msgbox.diff	Wed Jan 28 17:06:36 2009
@@ -1,9 +1,12 @@
---- officecfg/registry/schema/org/openoffice/Office/Common.xcs	2008-05-08 07:04:27.000000000 +0200
-+++ officecfg/registry/schema/org/openoffice/Office/Common.xcs	2008-05-07 10:32:49.000000000 +0200
-@@ -5505,6 +5505,15 @@
+diff --git officecfg/registry/schema/org/openoffice/Office/Common.xcs officecfg/registry/schema/org/openoffice/Office/Common.xcs
+index 6ac320f..3bdbf9e 100644
+--- officecfg/registry/schema/org/openoffice/Office/Common.xcs
++++ officecfg/registry/schema/org/openoffice/Office/Common.xcs
+@@ -5590,7 +5590,15 @@ Dymamic border coloring means that when the mouse is hovered over a control, and
  				</info>
  				<value>true</value>
  			</prop>
+-
 +			<prop oor:name="ShowLinkWarningDialog" oor:type="xs:boolean">
 +				<info>
 +					<author>THB</author>