[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                    |   28 +++++++++++++++-------------
 patches/dev300/layout-tab-sfx2-fix.diff |   12 ------------
 2 files changed, 15 insertions(+), 25 deletions(-)

New commits:
commit 4281ce306856cb273d91752a65729f3fb41683cc
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Aug 12 17:27:39 2009 +0300

    Second part of LayoutDialogs set is upstream
    
    * patches/dev300/apply: Comment out the second part of LayoutDialogs
      diffs that seem to be upstream. Often in a slightly modified form,
      but presumably with equivalent functionality.
    * patches/dev300/layout-tab-sfx2-fix.diff: Delete.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index fe686fa..0b5f727 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2315,19 +2315,21 @@ wmf-pattern-brush.diff, n#232232, rodo
 
 [ LayoutDialogs ]
 # convert some simple dialogs to layout engine
-layout-simple-dialogs-sc.diff
-layout-simple-dialogs-scp2.diff
-layout-simple-dialogs-scripting.diff
-layout-simple-dialogs-sd.diff
-layout-simple-dialogs-sfx2.diff
-layout-simple-dialogs-solenv.diff
-layout-simple-dialogs-starmath.diff
-layout-simple-dialogs-svx.diff
-#layout-simple-dialogs-svx-no-gtk.diff
-layout-simple-dialogs-sw.diff
-layout-simple-dialogs-toolkit.diff
-layout-simple-dialogs-vcl.diff
-layout-tab-sfx2-fix.diff, thorsten
+
+# FIXME: 2009-08-12: It seems that these are upstream, occasionally in
+# a slightly modified but equivalent way. --tml
+# layout-simple-dialogs-sc.diff
+# layout-simple-dialogs-scp2.diff
+# layout-simple-dialogs-scripting.diff
+# layout-simple-dialogs-sd.diff
+# layout-simple-dialogs-sfx2.diff
+# layout-simple-dialogs-solenv.diff
+# layout-simple-dialogs-starmath.diff
+# layout-simple-dialogs-svx.diff
+# #layout-simple-dialogs-svx-no-gtk.diff
+# layout-simple-dialogs-sw.diff
+# layout-simple-dialogs-toolkit.diff
+# layout-simple-dialogs-vcl.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
diff --git a/patches/dev300/layout-tab-sfx2-fix.diff b/patches/dev300/layout-tab-sfx2-fix.diff
deleted file mode 100644
index 82cad0c..0000000
--- a/patches/dev300/layout-tab-sfx2-fix.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- sfx2/inc/sfx2/tabdlg.hxx	2008-09-12 23:08:43.000000000 +0200
-+++ sfx2/inc/sfx2/tabdlg.hxx	2008-09-12 23:09:03.000000000 +0200
-@@ -248,7 +248,9 @@
- class SFX2_DLLPUBLIC SfxTabPage: public TabPage
- {
- friend class SfxTabDialog;
-+#if ENABLE_LAYOUT
- friend class layout::SfxTabDialog;
-+#endif
- 
- private:
- 	const SfxItemSet*	pSet;