[ooo-build-commit] 2 commits - patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                             |   18 +++++++++--------
 patches/dev300/layout-simple-dialogs-offapi.diff |   24 -----------------------
 2 files changed, 10 insertions(+), 32 deletions(-)

New commits:
commit 4b69650d7929cd266c6af60fd347b63aefe1f3df
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Aug 12 17:18:07 2009 +0300

    layout-simple-dialogs-offapi.diff is upstream
    
    * patches/dev300/layout-simple-dialogs-offapi.diff: Delete.
    * patches/dev300/apply: Drop it.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 4ecb3e6..fe686fa 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2315,7 +2315,6 @@ wmf-pattern-brush.diff, n#232232, rodo
 
 [ LayoutDialogs ]
 # convert some simple dialogs to layout engine
-layout-simple-dialogs-offapi.diff
 layout-simple-dialogs-sc.diff
 layout-simple-dialogs-scp2.diff
 layout-simple-dialogs-scripting.diff
diff --git a/patches/dev300/layout-simple-dialogs-offapi.diff b/patches/dev300/layout-simple-dialogs-offapi.diff
deleted file mode 100644
index 57a2233..0000000
--- a/patches/dev300/layout-simple-dialogs-offapi.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/offapi/com/sun/star/awt/XDialog2.idl b/offapi/com/sun/star/awt/XDialog2.idl
-index 70aafbc..83d4ca8 100644
---- offapi/com/sun/star/awt/XDialog2.idl
-+++ offapi/com/sun/star/awt/XDialog2.idl
-@@ -12,7 +12,7 @@ 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.
- 
-     @since OOo 3.0
-  */
-@@ -22,6 +22,10 @@ interface XDialog2: com::sun::star::awt::XDialog
-         to return with the given result value.
-      */
-     void endDialog ( [in] long Result );
-+    /** sets the help id so that the standard help button action will
-+        show the appropriate help page.
-+    */
-+    void setHelpId ( [in] long Id );
- }; 
-  
- //============================================================================= 
commit 221f80b005229e183d0b81b912160b1b45673840
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Aug 12 17:17:15 2009 +0300

    Bypass first part of LayoutDialogs for now
    
    * patches/dev300/apply: Bypass first part of LayoutDialogs for now.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 1d3fcd3..4ecb3e6 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2301,14 +2301,17 @@ wmf-pattern-brush.diff, n#232232, rodo
 
 [ LayoutDialogs ]
 # use old style widgets as plugin in a layout dialog
-layout-plugin-toolkit.diff
-
+# FIXME: 2009-08-12: These seem to be upstream, more or less? --tml
+# layout-plugin-toolkit.diff
 # use one or more layout tabpages in old .src tabbed dialog
-layout-tab-toolkit.diff
-layout-tab-sfx2.diff
-layout-tab-sc.diff
-layout-tab-svx.diff
-layout-tab-scp2.diff
+# layout-tab-toolkit.diff
+
+# FIXME: 2009-08-12: These might be partially upstream, or at least
+# require lots of work. --tml
+# layout-tab-sfx2.diff
+# layout-tab-sc.diff
+# layout-tab-svx.diff
+# layout-tab-scp2.diff
 
 [ LayoutDialogs ]
 # convert some simple dialogs to layout engine