summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-08-28 10:02:31 +0100
committerEike Rathke <erack@redhat.com>2014-08-28 09:53:22 -0500
commitb68d4b14c0ff336318602310dd987ced737b4213 (patch)
tree0aded39e36719c1e82c8d585b4195418690676fd
parent5b189dd7e075af80f3d4ba366a46561562854ba7 (diff)
bidi, the gift that keeps on giving
Change-Id: Ia33eb3e4c89963d7391df0339a2a5b948efd0d9f (cherry picked from commit 854bf7399a635928e6c155ef2246d636ab11ec13) Reviewed-on: https://gerrit.libreoffice.org/11166 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
-rw-r--r--external/icu/icu4c-icu11100.patch.110
1 files changed, 6 insertions, 4 deletions
diff --git a/external/icu/icu4c-icu11100.patch.1 b/external/icu/icu4c-icu11100.patch.1
index d44dc83cfd9e..f63a79f41046 100644
--- a/external/icu/icu4c-icu11100.patch.1
+++ b/external/icu/icu4c-icu11100.patch.1
@@ -1,19 +1,21 @@
--- icu/source/common/ubidi.c.orig 2014-08-09 20:54:39.338833533 +0100
+++ icu/source/common/ubidi.c 2014-08-09 20:55:48.625469055 +0100
-@@ -2097,6 +2097,12 @@
+@@ -2096,6 +2096,14 @@
return DirProp_ON;
}
+static int
+isolatesavailable(UBiDi *pBiDi) {
-+ return (pBiDi->isolateCount < SIMPLE_ISOLATES_SIZE-1 ||
-+ pBiDi->isolateCount < pBiDi->isolatesSize/sizeof(Isolate)-1);
++ if (pBiDi->isolates == pBiDi->simpleIsolates) {
++ return pBiDi->isolateCount < SIMPLE_ISOLATES_SIZE-1;
++ }
++ return pBiDi->isolateCount < pBiDi->isolatesSize/sizeof(Isolate)-1;
+}
+
static void
resolveImplicitLevels(UBiDi *pBiDi,
int32_t start, int32_t limit,
-@@ -2240,7 +2246,7 @@
+@@ -2239,7 +2247,7 @@
/* look for the last char not a BN or LRE/RLE/LRO/RLO/PDF */
for(i=limit-1; i>start&&(DIRPROP_FLAG(dirProps[i])&MASK_BN_EXPLICIT); i--);
dirProp=dirProps[i];