icu/icu4c-4_0_1-src.patch | 14 ++++++++++++++
sal/osl/unx/file_volume.cxx | 3 +--
unotools/source/config/moduleoptions.cxx | 4 ++--
3 files changed, 17 insertions(+), 4 deletions(-)
New commits:
commit 538d9d0573500521b639fc49fa3bbbc5a23a0a5a
Author: Herbert Dürr <h...@apache.org>
Date: Fri Mar 1 17:09:41 2013 +0000
WaE: fix css::FactoryInfo::setIcon()
diff --git a/unotools/source/config/moduleoptions.cxx
b/unotools/source/config/moduleoptions.cxx
index 234d660..15dfd65 100644
--- a/unotools/source/config/moduleoptions.cxx
+++ b/unotools/source/config/moduleoptions.cxx
@@ -311,9 +311,9 @@ struct FactoryInfo
//---------------------------------------------------------------------------------------------------------
void setIcon( sal_Int32 nNewIcon )
{
- if( nNewIcon != nNewIcon )
+ if( nIcon != nNewIcon )
{
- nNewIcon = nNewIcon;
+ nIcon = nNewIcon;
bChangedIcon = sal_True;
}
};
commit ea6c3939f113a06e1a0510541480b7275ca32502
Author: Herbert Dürr <h...@apache.org>
Date: Fri Mar 1 13:16:02 2013 +0000
quota.h should be included via generic path for our MacOSX targets
diff --git a/sal/osl/unx/file_volume.cxx b/sal/osl/unx/file_volume.cxx
index 47b05aa..eacc5e9 100644
--- a/sal/osl/unx/file_volume.cxx
+++ b/sal/osl/unx/file_volume.cxx
@@ -80,8 +80,7 @@ static const sal_Char* MOUNTTAB="/etc/mtab";
#elif defined(MACOSX)
-#include <ufs/ufs/quota.h>
-//#include <ctype.h>
+#include <sys/quota.h>
#include <sys/param.h>
#include <sys/mount.h>
#define HAVE_STATFS_H
commit 0ffb1b476b0b2188aa0a3286bb5e377252f6eedd
Author: Herbert Dürr <h...@apache.org>
Date: Fri Mar 1 12:58:45 2013 +0000
fix build breaker in ICU caused by narrowing conversion in an initializer
list
Upstream ICU should change the type of ranges.value to an uint32_t
but the static_cast is less invasive so it is better for our case
diff --git a/icu/icu4c-4_0_1-src.patch b/icu/icu4c-4_0_1-src.patch
index 4f6e655..121be81 100644
--- a/icu/icu4c-4_0_1-src.patch
+++ b/icu/icu4c-4_0_1-src.patch
@@ -285,3 +285,17 @@
--len;
}
}
+--- misc/icu/source/tools/genuca/genuca.cpp 2009-01-15 08:46:02.000000000
+0100
++++ misc/build/icu/source/tools/genuca/genuca.cpp 2013-01-30
07:45:01.000000000 +0100
+@@ -904,9 +904,9 @@
+ {0x20000, 0x2A6D6, UCOL_SPECIAL_FLAG | (CJK_IMPLICIT_TAG << 24) },
//6 CJK_IMPLICIT_TAG, /* 0x20000-0x2A6D6*/
+ {0x2F800, 0x2FA1D, UCOL_SPECIAL_FLAG | (CJK_IMPLICIT_TAG << 24) },
//7 CJK_IMPLICIT_TAG, /* 0x2F800-0x2FA1D*/
+ #endif
+- {0xAC00, 0xD7B0, UCOL_SPECIAL_FLAG | (HANGUL_SYLLABLE_TAG << 24) },
//0 HANGUL_SYLLABLE_TAG,/* AC00-D7AF*/
++ {0xAC00, 0xD7B0, static_cast<int32_t>(UCOL_SPECIAL_FLAG |
(HANGUL_SYLLABLE_TAG << 24)) }, //0 HANGUL_SYLLABLE_TAG,/* AC00-D7AF*/
+ //{0xD800, 0xDC00, UCOL_SPECIAL_FLAG | (LEAD_SURROGATE_TAG << 24) },
//1 LEAD_SURROGATE_TAG, /* D800-DBFF*/
+- {0xDC00, 0xE000, UCOL_SPECIAL_FLAG | (TRAIL_SURROGATE_TAG << 24) },
//2 TRAIL_SURROGATE DC00-DFFF
++ {0xDC00, 0xE000, static_cast<int32_t>(UCOL_SPECIAL_FLAG |
(TRAIL_SURROGATE_TAG << 24)) }, //2 TRAIL_SURROGATE DC00-DFFF
+ // Now directly handled in the collation code by the swapCJK function.
+ //{0x3400, 0x4DB6, UCOL_SPECIAL_FLAG | (CJK_IMPLICIT_TAG << 24) },
//3 CJK_IMPLICIT_TAG, /* 0x3400-0x4DB5*/
+ //{0x4E00, 0x9FA6, UCOL_SPECIAL_FLAG | (CJK_IMPLICIT_TAG << 24) },
//4 CJK_IMPLICIT_TAG, /* 0x4E00-0x9FA5*/
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
