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

[jannieuw svn gnome org]

Author: jannieuw
Date: Thu Jul 24 10:38:38 2008
New Revision: 13376
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13376&view=rev

Log:
2008-07-24  Jan Nieuwenhuizen  <janneke gnu org>

	* patches/dev300/layout-simple-dialogs-offapi.diff: New file.

	* patches/dev300/apply: Oops, add missing patch from GIT.  Thanks
	Noel.


Added:
   trunk/patches/dev300/layout-simple-dialogs-offapi.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Jul 24 10:38:38 2008
@@ -1049,7 +1049,7 @@
 [ LinuxOnly >= dev300-m22 < beb300-m0 ]
 # originally part of build-java-target.diff, but had to split out
 # because of CR problems
-codec-patch-with-crs.diff, pmladek
+##codec-patch-with-crs.diff, pmladek
 
 [ Win32Only >= dev300-m22 < beb300-m0 ]
 # originally part of build-java-target.diff, but had to split out
@@ -2154,9 +2154,10 @@
 layout-tab-sc.diff
 
 # convert some simple dialogs to layout engine
+layout-simple-dialogs-offapi.diff
+layout-simple-dialogs-sc-localize.diff
 layout-simple-dialogs-sc.diff
 layout-simple-dialogs-toolkit.diff
-layout-simple-dialogs-sc-localize.diff
 
 # FIXME: hack to avoid internal copiler error with gcc (SUSE Linux) 4.3.2 20080613 (prerelease)
 #        on openSUSE-11.1-alpha0; pmladek is discussing it with the gcc team

Added: trunk/patches/dev300/layout-simple-dialogs-offapi.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/layout-simple-dialogs-offapi.diff	Thu Jul 24 10:38:38 2008
@@ -0,0 +1,18 @@
+diff --git a/offapi/com/sun/star/awt/XDialog2.idl b/offapi/com/sun/star/awt/XDialog2.idl
+index a9b99dc..3cde809 100644
+--- offapi/com/sun/star/awt/XDialog2.idl
++++ offapi/com/sun/star/awt/XDialog2.idl
+@@ -12,11 +12,12 @@ module com {  module sun {  module star {  module awt {
+  
+ //============================================================================= 
+  
+-/** Makes it possible to end a dialog.
++/** Makes it possible to end a dialog and set a help id.
+  */
+ published interface XDialog2: com::sun::star::awt::XDialog
+ { 
+     void endDialog ( [in] long Result );
++    void setHelpId ( [in] long Id );
+ }; 
+  
+ //=============================================================================