diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-03-05 11:59:11 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-03-05 11:59:11 +0000 |
| commit | 356c072a77690c17380b5378b7299de879b1ea05 (patch) | |
| tree | 482abd9acb781b7a5407cd45b27849b359609125 /icu | |
| parent | b90b2de476b16bd899e644c6f26a054703443d82 (diff) | |
CWS-TOOLING: integrate CWS ooo31gsl2_DEV300
2009-02-18 16:57:37 +0100 hdu r268244 : #i99367# force logical-width of diacritic glyphs to zero
2009-02-18 14:51:18 +0100 pl r268224 : #i98525# correct popup menu position on right side in RTL UI
2009-02-18 13:17:20 +0100 pl r268213 : #i99299# check for NULL ptr
2009-02-18 10:51:48 +0100 pl r268204 : #i99167# revert change from issue 93173
2009-02-17 16:56:47 +0100 hdu r268181 : #i99295# src-=debug
2009-02-17 16:43:40 +0100 hdu r268180 : #i99295# retarget unresolved pLogCluster[n] to a glyph inside the cluster
2009-02-17 16:15:45 +0100 sj r268178 : #i94831# fixed performance of table import, no longer looping
2009-02-17 13:19:00 +0100 hdu r268165 : #i97304# reapplied SJ's fix for OOo31
2009-02-17 12:04:53 +0100 hdu r267989 : #i99241# revert upstream change from icu-trac issue 6249
2009-02-16 18:35:07 +0100 pl r267832 : #i99166# convolute the already convoluted RTL positioning code some more
2009-02-16 17:25:24 +0100 hdu r267828 : #i99227# do not export the glyph-flags for the i97326-workaround
2009-02-13 16:26:10 +0100 pl r267729 : #i98525# remove unused typeinfo header
2009-02-13 16:25:02 +0100 pl r267728 : #i98525# fix scrolling and native menu issues in RTL UI
2009-02-13 11:18:37 +0100 pl r267705 : #i98525# merge from CWS vcl99
Diffstat (limited to 'icu')
| -rw-r--r-- | icu/icu-4.0.patch | 34 |
1 files changed, 29 insertions, 5 deletions
diff --git a/icu/icu-4.0.patch b/icu/icu-4.0.patch index 30f2c8a8b525..cb46b9c71cae 100644 --- a/icu/icu-4.0.patch +++ b/icu/icu-4.0.patch @@ -84,9 +84,9 @@ ## Compilation rules %.$(STATIC_O): $(srcdir)/%.c ---- misc/icu/source/config/mh-solaris Tue Jul 1 03:41:26 2008 -+++ misc/build/icu/source/config/mh-solaris Tue Jan 20 18:33:16 2009 -@@ -18,16 +18,23 @@ +--- misc/icu/source/config/mh-solaris 2008-07-01 03:41:26.000000000 +0200 ++++ misc/build/icu/source/config/mh-solaris 2009-02-17 11:54:45.105890123 +0100 +@@ -18,17 +18,24 @@ ## Commands to link ## For Sun Workshop, use CC to link to bring in C++ runtime @@ -103,16 +103,40 @@ ## Compiler switch to embed a runtime search path LD_RPATH= -R LD_RPATH_PRE= -+ + +## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH +ENABLE_RPATH=YES +RPATHLDFLAGS=${LD_RPATH}'$$ORIGIN' + +#SH# ENABLE_RPATH=YES +#SH# RPATHLDFLAGS="${LD_RPATH}'$$ORIGIN'" - ++ #LIBRARY_PATH_PREFIX=/usr/lib/lwp: + ## Compiler switch to embed a library name +--- misc/icu/source/layout/ArabicShaping.cpp 2008-07-01 03:42:04.000000000 +0200 ++++ misc/build/icu/source/layout/ArabicShaping.cpp 2009-02-17 12:04:34.264869737 +0100 +@@ -79,7 +79,6 @@ + #define markFeatureMask 0x00040000UL + #define mkmkFeatureMask 0x00020000UL + +-#define NO_FEATURES 0 + #define ISOL_FEATURES (isolFeatureMask | ligaFeatureMask | msetFeatureMask | markFeatureMask | ccmpFeatureMask | rligFeatureMask | caltFeatureMask | dligFeatureMask | cswhFeatureMask | cursFeatureMask | kernFeatureMask | mkmkFeatureMask) + + #define SHAPE_MASK 0xF0000000UL +@@ -174,11 +173,7 @@ + LEUnicode c = chars[in]; + ShapeType t = getShapeType(c); + +- if (t == ST_NOSHAPE_NONE) { +- glyphStorage.setAuxData(out, NO_FEATURES, success); +- } else { +- glyphStorage.setAuxData(out, ISOL_FEATURES, success); +- } ++ glyphStorage.setAuxData(out, ISOL_FEATURES, success); + + if ((t & MASK_TRANSPARENT) != 0) { + continue; --- misc/icu/source/layoutex/ParagraphLayout.cpp 2008-07-01 03:42:02.000000000 +0200 +++ misc/build/icu/source/layoutex/ParagraphLayout.cpp 2008-12-01 19:32:58.000000000 +0100 @@ -868,7 +868,7 @@ |