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

[thorstenb svn gnome org]

Author: thorstenb
Date: Fri Sep 12 21:16:32 2008
New Revision: 13891
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13891&view=rev

Log:
    * patches/dev300/apply:
    * patches/dev300/layout-tab-sfx2-fix.diff: fix breakage on Apple's
    gcc 4.0.1 flavor.



Added:
   trunk/patches/dev300/layout-tab-sfx2-fix.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Sep 12 21:16:32 2008
@@ -2050,6 +2050,7 @@
 layout-tab-sc.diff
 layout-tab-scp2.diff
 layout-tab-svx.diff
+layout-tab-sfx2-fix.diff, thorsten
 
 # convert some simple dialogs to layout engine
 layout-simple-dialogs-offapi.diff

Added: trunk/patches/dev300/layout-tab-sfx2-fix.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/layout-tab-sfx2-fix.diff	Fri Sep 12 21:16:32 2008
@@ -0,0 +1,12 @@
+--- 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;