[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Tor Lillqvist]

 patches/dev300/build-fix-layout-numfmt.diff |   21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

New commits:
commit cac1a49fb87054e4ac5c4ba5ef0ceeb86f51274e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Apr 4 16:44:59 2011 +0300

    Make build-fix-layout-numfmt.diff apply again

diff --git a/patches/dev300/build-fix-layout-numfmt.diff b/patches/dev300/build-fix-layout-numfmt.diff
index a0b1949..c791f38 100644
--- a/patches/dev300/build-fix-layout-numfmt.diff
+++ b/patches/dev300/build-fix-layout-numfmt.diff
@@ -1,22 +1,13 @@
----
- cui/source/tabpages/numfmt.cxx |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git cui/source/tabpages/numfmt.cxx cui/source/tabpages/numfmt.cxx
-index 794d41f..c58c45c 100644
 --- cui/source/tabpages/numfmt.cxx
 +++ cui/source/tabpages/numfmt.cxx
-@@ -25,8 +25,8 @@
+@@ -25,6 +25,10 @@
   *
   ************************************************************************/
  
--#if !ENABLE_LAYOUT_EXPERIMENTAL
--//#undef ENABLE_LAYOUT
 +#if !ENABLE_LAYOUT_EXPERIMENTAL && defined (ENABLE_LAYOUT)
 +#undef ENABLE_LAYOUT
- #endif
- 
- // MARKER(update_precomp.py): autogen include statement, do not remove
--- 
-1.7.0.1
-
++#endif
++ 
+ // include ---------------------------------------------------------------
+ #include <svl/eitem.hxx>
+ #include <svl/intitem.hxx>