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

[jannieuw svn gnome org]

Author: jannieuw
Date: Thu Sep 25 08:05:54 2008
New Revision: 14070
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14070&view=rev

Log:
2008-09-25  Jan Nieuwenhuizen  <janneke gnu org>

	* patches/dev300/layout-simple-dialogs-sc.diff: Build fix for
	--enable-layout.  Thanks Petr.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/layout-simple-dialogs-sc.diff

Modified: trunk/patches/dev300/layout-simple-dialogs-sc.diff
==============================================================================
--- trunk/patches/dev300/layout-simple-dialogs-sc.diff	(original)
+++ trunk/patches/dev300/layout-simple-dialogs-sc.diff	Thu Sep 25 08:05:54 2008
@@ -681,3 +681,24 @@
 +	</dialogbuttonhbox>
 +    </vbox>
 +</modaldialog>
+diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx
+index ed6bdc8..2a72ed2 100644
+--- sc/source/ui/inc/tpsort.hxx
++++ sc/source/ui/inc/tpsort.hxx
+@@ -185,13 +185,9 @@ private:
+ 
+ //     FixedText           aFtAreaLabel;
+ //  FixedInfo           aFtArea;
+-#if ENABLE_LAYOUT
+-#define String layout::LocalizedString
+-#endif /* ENABLE_LAYOUT */
+-    String              aStrRowLabel;
+-    String              aStrColLabel;
+-    String              aStrUndefined;
+-#undef String
++    LocalizedString aStrRowLabel;
++    LocalizedString aStrColLabel;
++    LocalizedString aStrUndefined;
+     String              aStrNoName;
+     String              aStrAreaLabel;
+