[Libreoffice-commits] .: 2 commits - patches/dev300

[Tor Lillqvist]

 patches/dev300/icu-4.2.1.diff                        |   15 ++++++++++++++-
 patches/dev300/oox-pptx-export-para-linespacing.diff |    2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

New commits:
commit 71d1aba20bf8ecf1aeb598b7c1bdbad6186178c9
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Oct 27 20:08:52 2010 +0300

    Make oox-pptx-export-para-linespacing.diff apply

diff --git a/patches/dev300/oox-pptx-export-para-linespacing.diff b/patches/dev300/oox-pptx-export-para-linespacing.diff
index b7997e8..6e01337 100644
--- a/patches/dev300/oox-pptx-export-para-linespacing.diff
+++ b/patches/dev300/oox-pptx-export-para-linespacing.diff
@@ -39,7 +39,7 @@ index 752ead6..73f5f3e 100644
  #include <com/sun/star/container/XIndexAccess.hpp>
  #include <com/sun/star/drawing/BitmapMode.hpp>
 @@ -51,6 +53,8 @@
- #include <com/sun/star/drawing/XShape.hpp>
+ #include <com/sun/star/drawing/BitmapMode.hpp>
  #include <com/sun/star/i18n/ScriptType.hpp>
  #include <com/sun/star/io/XOutputStream.hpp>
 +#include <com/sun/star/style/LineSpacing.hpp>
commit 6ff66d7da56f5b0ce7a8fa1f861f081279975f50
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Oct 27 20:03:29 2010 +0300

    Make icu-4.2.1.diff unapply cleanly
    
    It wanted to remove the icu/icu4c-4_0_1-src.patch file, but did not do
    it completely. For icu-4.2.1.diff be able to be unapplied cleanly, all
    the lines in the icu/icu4c-4_0_1-src.patch file need to be removed.

diff --git a/patches/dev300/icu-4.2.1.diff b/patches/dev300/icu-4.2.1.diff
index eb73a4e..887ef3f 100644
--- a/patches/dev300/icu-4.2.1.diff
+++ b/patches/dev300/icu-4.2.1.diff
@@ -153,7 +153,7 @@ deleted file mode 100644
 index 172d624..0000000
 --- icu/icu4c-4_0_1-src.patch
 +++ /dev/null
-@@ -1,247 +0,0 @@
+@@ -1,260 +0,0 @@
 ---- misc/icu/source/common/putil.c	2008-07-01 03:41:12.000000000 +0200
 -+++ misc/build/icu/source/common/putil.c	2008-09-02 07:01:29.335795765 +0200
 -@@ -52,7 +52,7 @@
@@ -401,6 +401,19 @@ index 172d624..0000000
 -     T_FileStream_writeLine(makefile, tmp);
 - 
 -     if(o->hadStdin == FALSE) { /* shortcut */
+---- misc/build/icu/source/test/intltest/dtifmtts.cpp.old	2010-09-20 20:49:33.953125000 +0200
+-+++ misc/build/icu/source/test/intltest/dtifmtts.cpp	2010-09-20 20:51:37.875000000 +0200
+-@@ -13,8 +13,9 @@
+- //FIXME: define it in compiler flag
+- //#define DTIFMTTS_DEBUG 1
+- 
+--
+-+#if defined (_MSC_VER) && (_MSC_VER < 1600)
+- #include <iostream>
+-+#endif
+- #ifdef DTIFMTTS_DEBUG 
+- #endif
+-
 --- /dev/null
 +++ icu/icu4c-4_2_1-src.patch
 @@ -0,0 +1,474 @@