summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorMartin Blapp <mbr@FreeBSD.org>2002-08-13 21:12:06 +0000
committerMartin Blapp <mbr@FreeBSD.org>2002-08-13 21:12:06 +0000
commit29370d3dee624a43df8669a4d27f27ba751f8bf4 (patch)
tree27bfcbe5f004608cef483da6434b98307ef45b0c /editors
parentUpdate to 0.4.12. (diff)
Fix a ugly bug in a binary compare function which made OpenOffice
dump in Options->Load/Save/HTML Compatibility. If $LANG was not set in ENV, TXT files could not be read anymore.
Notes
Notes: svn path=/head/; revision=64475
Diffstat (limited to 'editors')
-rw-r--r--editors/openoffice-1.0/files/patch-sal+osl+unx+nlsupport.c22
-rw-r--r--editors/openoffice-1.0/files/patch-sal::osl::unx::nlsupport.c22
-rw-r--r--editors/openoffice-1.1-devel/files/patch-sal+osl+unx+nlsupport.c22
-rw-r--r--editors/openoffice-1.1/files/patch-sal+osl+unx+nlsupport.c22
-rw-r--r--editors/openoffice-2.0-devel/files/patch-sal+osl+unx+nlsupport.c22
-rw-r--r--editors/openoffice-3-devel/files/patch-sal+osl+unx+nlsupport.c22
-rw-r--r--editors/openoffice-3/files/patch-sal+osl+unx+nlsupport.c22
-rw-r--r--editors/openoffice-devel/files/patch-sal+osl+unx+nlsupport.c22
-rw-r--r--editors/openoffice.org-1.0/files/patch-sal+osl+unx+nlsupport.c22
-rw-r--r--editors/openoffice.org-1.0/files/patch-sal::osl::unx::nlsupport.c22
-rw-r--r--editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+nlsupport.c22
-rw-r--r--editors/openoffice.org-1.1/files/patch-sal+osl+unx+nlsupport.c22
-rw-r--r--editors/openoffice.org-2-RC/files/patch-sal+osl+unx+nlsupport.c22
-rw-r--r--editors/openoffice.org-2-devel/files/patch-sal+osl+unx+nlsupport.c22
-rw-r--r--editors/openoffice.org-2.0-devel/files/patch-sal+osl+unx+nlsupport.c22
-rw-r--r--editors/openoffice.org-2.0/files/patch-sal+osl+unx+nlsupport.c22
-rw-r--r--editors/openoffice.org-2/files/patch-sal+osl+unx+nlsupport.c22
-rw-r--r--editors/openoffice.org-3-RC/files/patch-sal+osl+unx+nlsupport.c22
-rw-r--r--editors/openoffice.org-3-devel/files/patch-sal+osl+unx+nlsupport.c22
-rw-r--r--editors/openoffice.org-3/files/patch-sal+osl+unx+nlsupport.c22
-rw-r--r--editors/openoffice.org-vcltesttool/files/patch-sal+osl+unx+nlsupport.c22
-rw-r--r--editors/openoffice/files/patch-sal+osl+unx+nlsupport.c22
-rw-r--r--editors/openoffice/files/patch-sal::osl::unx::nlsupport.c22
23 files changed, 368 insertions, 138 deletions
diff --git a/editors/openoffice-1.0/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice-1.0/files/patch-sal+osl+unx+nlsupport.c
index 2df241afd86b..5fab5cf69c19 100644
--- a/editors/openoffice-1.0/files/patch-sal+osl+unx+nlsupport.c
+++ b/editors/openoffice-1.0/files/patch-sal+osl+unx+nlsupport.c
@@ -9,7 +9,17 @@
#include <pthread.h>
#include <locale.h>
#include <langinfo.h>
-@@ -241,12 +241,13 @@
+@@ -114,8 +114,7 @@
+ comparison = _pair_compare( key, base + current );
+ if (comparison < 0)
+ upper = current;
+- else
+- if (comparison > 0)
++ else if (comparison > 0)
+ lower = current + 1;
+ else
+ return base + current;
+@@ -241,12 +240,13 @@
return NULL;
}
@@ -25,7 +35,7 @@
*
* This routine is SLOW because of the setlocale call, so
* grab the result and cache it.
-@@ -312,7 +313,30 @@
+@@ -312,7 +312,30 @@
{ "big5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
{ "eucgbk", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */
{ "gbk", RTL_TEXTENCODING_GBK }, /* China - Simplified Chinese */
@@ -57,7 +67,7 @@
};
#elif defined(LINUX) || defined(NETBSD)
-@@ -496,7 +520,7 @@
+@@ -496,7 +519,7 @@
{ "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */
};
@@ -66,7 +76,7 @@
static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
-@@ -618,7 +642,7 @@
+@@ -618,7 +641,7 @@
return ret;
}
@@ -75,7 +85,7 @@
/*
* FIXME: the MacOS X implemetation is missing
-@@ -651,7 +675,7 @@
+@@ -651,7 +674,7 @@
return 0;
}
@@ -84,7 +94,7 @@
/*
* This implementation of osl_getTextEncodingFromLocale maps
-@@ -887,6 +911,6 @@
+@@ -887,6 +910,6 @@
return 0;
}
diff --git a/editors/openoffice-1.0/files/patch-sal::osl::unx::nlsupport.c b/editors/openoffice-1.0/files/patch-sal::osl::unx::nlsupport.c
index 2df241afd86b..5fab5cf69c19 100644
--- a/editors/openoffice-1.0/files/patch-sal::osl::unx::nlsupport.c
+++ b/editors/openoffice-1.0/files/patch-sal::osl::unx::nlsupport.c
@@ -9,7 +9,17 @@
#include <pthread.h>
#include <locale.h>
#include <langinfo.h>
-@@ -241,12 +241,13 @@
+@@ -114,8 +114,7 @@
+ comparison = _pair_compare( key, base + current );
+ if (comparison < 0)
+ upper = current;
+- else
+- if (comparison > 0)
++ else if (comparison > 0)
+ lower = current + 1;
+ else
+ return base + current;
+@@ -241,12 +240,13 @@
return NULL;
}
@@ -25,7 +35,7 @@
*
* This routine is SLOW because of the setlocale call, so
* grab the result and cache it.
-@@ -312,7 +313,30 @@
+@@ -312,7 +312,30 @@
{ "big5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
{ "eucgbk", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */
{ "gbk", RTL_TEXTENCODING_GBK }, /* China - Simplified Chinese */
@@ -57,7 +67,7 @@
};
#elif defined(LINUX) || defined(NETBSD)
-@@ -496,7 +520,7 @@
+@@ -496,7 +519,7 @@
{ "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */
};
@@ -66,7 +76,7 @@
static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
-@@ -618,7 +642,7 @@
+@@ -618,7 +641,7 @@
return ret;
}
@@ -75,7 +85,7 @@
/*
* FIXME: the MacOS X implemetation is missing
-@@ -651,7 +675,7 @@
+@@ -651,7 +674,7 @@
return 0;
}
@@ -84,7 +94,7 @@
/*
* This implementation of osl_getTextEncodingFromLocale maps
-@@ -887,6 +911,6 @@
+@@ -887,6 +910,6 @@
return 0;
}
diff --git a/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+nlsupport.c
index 2df241afd86b..5fab5cf69c19 100644
--- a/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+nlsupport.c
+++ b/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+nlsupport.c
@@ -9,7 +9,17 @@
#include <pthread.h>
#include <locale.h>
#include <langinfo.h>
-@@ -241,12 +241,13 @@
+@@ -114,8 +114,7 @@
+ comparison = _pair_compare( key, base + current );
+ if (comparison < 0)
+ upper = current;
+- else
+- if (comparison > 0)
++ else if (comparison > 0)
+ lower = current + 1;
+ else
+ return base + current;
+@@ -241,12 +240,13 @@
return NULL;
}
@@ -25,7 +35,7 @@
*
* This routine is SLOW because of the setlocale call, so
* grab the result and cache it.
-@@ -312,7 +313,30 @@
+@@ -312,7 +312,30 @@
{ "big5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
{ "eucgbk", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */
{ "gbk", RTL_TEXTENCODING_GBK }, /* China - Simplified Chinese */
@@ -57,7 +67,7 @@
};
#elif defined(LINUX) || defined(NETBSD)
-@@ -496,7 +520,7 @@
+@@ -496,7 +519,7 @@
{ "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */
};
@@ -66,7 +76,7 @@
static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
-@@ -618,7 +642,7 @@
+@@ -618,7 +641,7 @@
return ret;
}
@@ -75,7 +85,7 @@
/*
* FIXME: the MacOS X implemetation is missing
-@@ -651,7 +675,7 @@
+@@ -651,7 +674,7 @@
return 0;
}
@@ -84,7 +94,7 @@
/*
* This implementation of osl_getTextEncodingFromLocale maps
-@@ -887,6 +911,6 @@
+@@ -887,6 +910,6 @@
return 0;
}
diff --git a/editors/openoffice-1.1/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice-1.1/files/patch-sal+osl+unx+nlsupport.c
index 2df241afd86b..5fab5cf69c19 100644
--- a/editors/openoffice-1.1/files/patch-sal+osl+unx+nlsupport.c
+++ b/editors/openoffice-1.1/files/patch-sal+osl+unx+nlsupport.c
@@ -9,7 +9,17 @@
#include <pthread.h>
#include <locale.h>
#include <langinfo.h>
-@@ -241,12 +241,13 @@
+@@ -114,8 +114,7 @@
+ comparison = _pair_compare( key, base + current );
+ if (comparison < 0)
+ upper = current;
+- else
+- if (comparison > 0)
++ else if (comparison > 0)
+ lower = current + 1;
+ else
+ return base + current;
+@@ -241,12 +240,13 @@
return NULL;
}
@@ -25,7 +35,7 @@
*
* This routine is SLOW because of the setlocale call, so
* grab the result and cache it.
-@@ -312,7 +313,30 @@
+@@ -312,7 +312,30 @@
{ "big5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
{ "eucgbk", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */
{ "gbk", RTL_TEXTENCODING_GBK }, /* China - Simplified Chinese */
@@ -57,7 +67,7 @@
};
#elif defined(LINUX) || defined(NETBSD)
-@@ -496,7 +520,7 @@
+@@ -496,7 +519,7 @@
{ "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */
};
@@ -66,7 +76,7 @@
static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
-@@ -618,7 +642,7 @@
+@@ -618,7 +641,7 @@
return ret;
}
@@ -75,7 +85,7 @@
/*
* FIXME: the MacOS X implemetation is missing
-@@ -651,7 +675,7 @@
+@@ -651,7 +674,7 @@
return 0;
}
@@ -84,7 +94,7 @@
/*
* This implementation of osl_getTextEncodingFromLocale maps
-@@ -887,6 +911,6 @@
+@@ -887,6 +910,6 @@
return 0;
}
diff --git a/editors/openoffice-2.0-devel/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice-2.0-devel/files/patch-sal+osl+unx+nlsupport.c
index 2df241afd86b..5fab5cf69c19 100644
--- a/editors/openoffice-2.0-devel/files/patch-sal+osl+unx+nlsupport.c
+++ b/editors/openoffice-2.0-devel/files/patch-sal+osl+unx+nlsupport.c
@@ -9,7 +9,17 @@
#include <pthread.h>
#include <locale.h>
#include <langinfo.h>
-@@ -241,12 +241,13 @@
+@@ -114,8 +114,7 @@
+ comparison = _pair_compare( key, base + current );
+ if (comparison < 0)
+ upper = current;
+- else
+- if (comparison > 0)
++ else if (comparison > 0)
+ lower = current + 1;
+ else
+ return base + current;
+@@ -241,12 +240,13 @@
return NULL;
}
@@ -25,7 +35,7 @@
*
* This routine is SLOW because of the setlocale call, so
* grab the result and cache it.
-@@ -312,7 +313,30 @@
+@@ -312,7 +312,30 @@
{ "big5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
{ "eucgbk", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */
{ "gbk", RTL_TEXTENCODING_GBK }, /* China - Simplified Chinese */
@@ -57,7 +67,7 @@
};
#elif defined(LINUX) || defined(NETBSD)
-@@ -496,7 +520,7 @@
+@@ -496,7 +519,7 @@
{ "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */
};
@@ -66,7 +76,7 @@
static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
-@@ -618,7 +642,7 @@
+@@ -618,7 +641,7 @@
return ret;
}
@@ -75,7 +85,7 @@
/*
* FIXME: the MacOS X implemetation is missing
-@@ -651,7 +675,7 @@
+@@ -651,7 +674,7 @@
return 0;
}
@@ -84,7 +94,7 @@
/*
* This implementation of osl_getTextEncodingFromLocale maps
-@@ -887,6 +911,6 @@
+@@ -887,6 +910,6 @@
return 0;
}
diff --git a/editors/openoffice-3-devel/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice-3-devel/files/patch-sal+osl+unx+nlsupport.c
index 2df241afd86b..5fab5cf69c19 100644
--- a/editors/openoffice-3-devel/files/patch-sal+osl+unx+nlsupport.c
+++ b/editors/openoffice-3-devel/files/patch-sal+osl+unx+nlsupport.c
@@ -9,7 +9,17 @@
#include <pthread.h>
#include <locale.h>
#include <langinfo.h>
-@@ -241,12 +241,13 @@
+@@ -114,8 +114,7 @@
+ comparison = _pair_compare( key, base + current );
+ if (comparison < 0)
+ upper = current;
+- else
+- if (comparison > 0)
++ else if (comparison > 0)
+ lower = current + 1;
+ else
+ return base + current;
+@@ -241,12 +240,13 @@
return NULL;
}
@@ -25,7 +35,7 @@
*
* This routine is SLOW because of the setlocale call, so
* grab the result and cache it.
-@@ -312,7 +313,30 @@
+@@ -312,7 +312,30 @@
{ "big5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
{ "eucgbk", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */
{ "gbk", RTL_TEXTENCODING_GBK }, /* China - Simplified Chinese */
@@ -57,7 +67,7 @@
};
#elif defined(LINUX) || defined(NETBSD)
-@@ -496,7 +520,7 @@
+@@ -496,7 +519,7 @@
{ "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */
};
@@ -66,7 +76,7 @@
static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
-@@ -618,7 +642,7 @@
+@@ -618,7 +641,7 @@
return ret;
}
@@ -75,7 +85,7 @@
/*
* FIXME: the MacOS X implemetation is missing
-@@ -651,7 +675,7 @@
+@@ -651,7 +674,7 @@
return 0;
}
@@ -84,7 +94,7 @@
/*
* This implementation of osl_getTextEncodingFromLocale maps
-@@ -887,6 +911,6 @@
+@@ -887,6 +910,6 @@
return 0;
}
diff --git a/editors/openoffice-3/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice-3/files/patch-sal+osl+unx+nlsupport.c
index 2df241afd86b..5fab5cf69c19 100644
--- a/editors/openoffice-3/files/patch-sal+osl+unx+nlsupport.c
+++ b/editors/openoffice-3/files/patch-sal+osl+unx+nlsupport.c
@@ -9,7 +9,17 @@
#include <pthread.h>
#include <locale.h>
#include <langinfo.h>
-@@ -241,12 +241,13 @@
+@@ -114,8 +114,7 @@
+ comparison = _pair_compare( key, base + current );
+ if (comparison < 0)
+ upper = current;
+- else
+- if (comparison > 0)
++ else if (comparison > 0)
+ lower = current + 1;
+ else
+ return base + current;
+@@ -241,12 +240,13 @@
return NULL;
}
@@ -25,7 +35,7 @@
*
* This routine is SLOW because of the setlocale call, so
* grab the result and cache it.
-@@ -312,7 +313,30 @@
+@@ -312,7 +312,30 @@
{ "big5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
{ "eucgbk", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */
{ "gbk", RTL_TEXTENCODING_GBK }, /* China - Simplified Chinese */
@@ -57,7 +67,7 @@
};
#elif defined(LINUX) || defined(NETBSD)
-@@ -496,7 +520,7 @@
+@@ -496,7 +519,7 @@
{ "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */
};
@@ -66,7 +76,7 @@
static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
-@@ -618,7 +642,7 @@
+@@ -618,7 +641,7 @@
return ret;
}
@@ -75,7 +85,7 @@
/*
* FIXME: the MacOS X implemetation is missing
-@@ -651,7 +675,7 @@
+@@ -651,7 +674,7 @@
return 0;
}
@@ -84,7 +94,7 @@
/*
* This implementation of osl_getTextEncodingFromLocale maps
-@@ -887,6 +911,6 @@
+@@ -887,6 +910,6 @@
return 0;
}
diff --git a/editors/openoffice-devel/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice-devel/files/patch-sal+osl+unx+nlsupport.c
index 2df241afd86b..5fab5cf69c19 100644
--- a/editors/openoffice-devel/files/patch-sal+osl+unx+nlsupport.c
+++ b/editors/openoffice-devel/files/patch-sal+osl+unx+nlsupport.c
@@ -9,7 +9,17 @@
#include <pthread.h>
#include <locale.h>
#include <langinfo.h>
-@@ -241,12 +241,13 @@
+@@ -114,8 +114,7 @@
+ comparison = _pair_compare( key, base + current );
+ if (comparison < 0)
+ upper = current;
+- else
+- if (comparison > 0)
++ else if (comparison > 0)
+ lower = current + 1;
+ else
+ return base + current;
+@@ -241,12 +240,13 @@
return NULL;
}
@@ -25,7 +35,7 @@
*
* This routine is SLOW because of the setlocale call, so
* grab the result and cache it.
-@@ -312,7 +313,30 @@
+@@ -312,7 +312,30 @@
{ "big5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
{ "eucgbk", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */
{ "gbk", RTL_TEXTENCODING_GBK }, /* China - Simplified Chinese */
@@ -57,7 +67,7 @@
};
#elif defined(LINUX) || defined(NETBSD)
-@@ -496,7 +520,7 @@
+@@ -496,7 +519,7 @@
{ "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */
};
@@ -66,7 +76,7 @@
static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
-@@ -618,7 +642,7 @@
+@@ -618,7 +641,7 @@
return ret;
}
@@ -75,7 +85,7 @@
/*
* FIXME: the MacOS X implemetation is missing
-@@ -651,7 +675,7 @@
+@@ -651,7 +674,7 @@
return 0;
}
@@ -84,7 +94,7 @@
/*
* This implementation of osl_getTextEncodingFromLocale maps
-@@ -887,6 +911,6 @@
+@@ -887,6 +910,6 @@
return 0;
}
diff --git a/editors/openoffice.org-1.0/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice.org-1.0/files/patch-sal+osl+unx+nlsupport.c
index 2df241afd86b..5fab5cf69c19 100644
--- a/editors/openoffice.org-1.0/files/patch-sal+osl+unx+nlsupport.c
+++ b/editors/openoffice.org-1.0/files/patch-sal+osl+unx+nlsupport.c
@@ -9,7 +9,17 @@
#include <pthread.h>
#include <locale.h>
#include <langinfo.h>
-@@ -241,12 +241,13 @@
+@@ -114,8 +114,7 @@
+ comparison = _pair_compare( key, base + current );
+ if (comparison < 0)
+ upper = current;
+- else
+- if (comparison > 0)
++ else if (comparison > 0)
+ lower = current + 1;
+ else
+ return base + current;
+@@ -241,12 +240,13 @@
return NULL;
}
@@ -25,7 +35,7 @@
*
* This routine is SLOW because of the setlocale call, so
* grab the result and cache it.
-@@ -312,7 +313,30 @@
+@@ -312,7 +312,30 @@
{ "big5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
{ "eucgbk", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */
{ "gbk", RTL_TEXTENCODING_GBK }, /* China - Simplified Chinese */
@@ -57,7 +67,7 @@
};
#elif defined(LINUX) || defined(NETBSD)
-@@ -496,7 +520,7 @@
+@@ -496,7 +519,7 @@
{ "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */
};
@@ -66,7 +76,7 @@
static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
-@@ -618,7 +642,7 @@
+@@ -618,7 +641,7 @@
return ret;
}
@@ -75,7 +85,7 @@
/*
* FIXME: the MacOS X implemetation is missing
-@@ -651,7 +675,7 @@
+@@ -651,7 +674,7 @@
return 0;
}
@@ -84,7 +94,7 @@
/*
* This implementation of osl_getTextEncodingFromLocale maps
-@@ -887,6 +911,6 @@
+@@ -887,6 +910,6 @@
return 0;
}
diff --git a/editors/openoffice.org-1.0/files/patch-sal::osl::unx::nlsupport.c b/editors/openoffice.org-1.0/files/patch-sal::osl::unx::nlsupport.c
index 2df241afd86b..5fab5cf69c19 100644
--- a/editors/openoffice.org-1.0/files/patch-sal::osl::unx::nlsupport.c
+++ b/editors/openoffice.org-1.0/files/patch-sal::osl::unx::nlsupport.c
@@ -9,7 +9,17 @@
#include <pthread.h>
#include <locale.h>
#include <langinfo.h>
-@@ -241,12 +241,13 @@
+@@ -114,8 +114,7 @@
+ comparison = _pair_compare( key, base + current );
+ if (comparison < 0)
+ upper = current;
+- else
+- if (comparison > 0)
++ else if (comparison > 0)
+ lower = current + 1;
+ else
+ return base + current;
+@@ -241,12 +240,13 @@
return NULL;
}
@@ -25,7 +35,7 @@
*
* This routine is SLOW because of the setlocale call, so
* grab the result and cache it.
-@@ -312,7 +313,30 @@
+@@ -312,7 +312,30 @@
{ "big5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
{ "eucgbk", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */
{ "gbk", RTL_TEXTENCODING_GBK }, /* China - Simplified Chinese */
@@ -57,7 +67,7 @@
};
#elif defined(LINUX) || defined(NETBSD)
-@@ -496,7 +520,7 @@
+@@ -496,7 +519,7 @@
{ "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */
};
@@ -66,7 +76,7 @@
static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
-@@ -618,7 +642,7 @@
+@@ -618,7 +641,7 @@
return ret;
}
@@ -75,7 +85,7 @@
/*
* FIXME: the MacOS X implemetation is missing
-@@ -651,7 +675,7 @@
+@@ -651,7 +674,7 @@
return 0;
}
@@ -84,7 +94,7 @@
/*
* This implementation of osl_getTextEncodingFromLocale maps
-@@ -887,6 +911,6 @@
+@@ -887,6 +910,6 @@
return 0;
}
diff --git a/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+nlsupport.c
index 2df241afd86b..5fab5cf69c19 100644
--- a/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+nlsupport.c
+++ b/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+nlsupport.c
@@ -9,7 +9,17 @@
#include <pthread.h>
#include <locale.h>
#include <langinfo.h>
-@@ -241,12 +241,13 @@
+@@ -114,8 +114,7 @@
+ comparison = _pair_compare( key, base + current );
+ if (comparison < 0)
+ upper = current;
+- else
+- if (comparison > 0)
++ else if (comparison > 0)
+ lower = current + 1;
+ else
+ return base + current;
+@@ -241,12 +240,13 @@
return NULL;
}
@@ -25,7 +35,7 @@
*
* This routine is SLOW because of the setlocale call, so
* grab the result and cache it.
-@@ -312,7 +313,30 @@
+@@ -312,7 +312,30 @@
{ "big5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
{ "eucgbk", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */
{ "gbk", RTL_TEXTENCODING_GBK }, /* China - Simplified Chinese */
@@ -57,7 +67,7 @@
};
#elif defined(LINUX) || defined(NETBSD)
-@@ -496,7 +520,7 @@
+@@ -496,7 +519,7 @@
{ "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */
};
@@ -66,7 +76,7 @@
static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
-@@ -618,7 +642,7 @@
+@@ -618,7 +641,7 @@
return ret;
}
@@ -75,7 +85,7 @@
/*
* FIXME: the MacOS X implemetation is missing
-@@ -651,7 +675,7 @@
+@@ -651,7 +674,7 @@
return 0;
}
@@ -84,7 +94,7 @@
/*
* This implementation of osl_getTextEncodingFromLocale maps
-@@ -887,6 +911,6 @@
+@@ -887,6 +910,6 @@
return 0;
}
diff --git a/editors/openoffice.org-1.1/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice.org-1.1/files/patch-sal+osl+unx+nlsupport.c
index 2df241afd86b..5fab5cf69c19 100644
--- a/editors/openoffice.org-1.1/files/patch-sal+osl+unx+nlsupport.c
+++ b/editors/openoffice.org-1.1/files/patch-sal+osl+unx+nlsupport.c
@@ -9,7 +9,17 @@
#include <pthread.h>
#include <locale.h>
#include <langinfo.h>
-@@ -241,12 +241,13 @@
+@@ -114,8 +114,7 @@
+ comparison = _pair_compare( key, base + current );
+ if (comparison < 0)
+ upper = current;
+- else
+- if (comparison > 0)
++ else if (comparison > 0)
+ lower = current + 1;
+ else
+ return base + current;
+@@ -241,12 +240,13 @@
return NULL;
}
@@ -25,7 +35,7 @@
*
* This routine is SLOW because of the setlocale call, so
* grab the result and cache it.
-@@ -312,7 +313,30 @@
+@@ -312,7 +312,30 @@
{ "big5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
{ "eucgbk", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */
{ "gbk", RTL_TEXTENCODING_GBK }, /* China - Simplified Chinese */
@@ -57,7 +67,7 @@
};
#elif defined(LINUX) || defined(NETBSD)
-@@ -496,7 +520,7 @@
+@@ -496,7 +519,7 @@
{ "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */
};
@@ -66,7 +76,7 @@
static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
-@@ -618,7 +642,7 @@
+@@ -618,7 +641,7 @@
return ret;
}
@@ -75,7 +85,7 @@
/*
* FIXME: the MacOS X implemetation is missing
-@@ -651,7 +675,7 @@
+@@ -651,7 +674,7 @@
return 0;
}
@@ -84,7 +94,7 @@
/*
* This implementation of osl_getTextEncodingFromLocale maps
-@@ -887,6 +911,6 @@
+@@ -887,6 +910,6 @@
return 0;
}
diff --git a/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+nlsupport.c
index 2df241afd86b..5fab5cf69c19 100644
--- a/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+nlsupport.c
+++ b/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+nlsupport.c
@@ -9,7 +9,17 @@
#include <pthread.h>
#include <locale.h>
#include <langinfo.h>
-@@ -241,12 +241,13 @@
+@@ -114,8 +114,7 @@
+ comparison = _pair_compare( key, base + current );
+ if (comparison < 0)
+ upper = current;
+- else
+- if (comparison > 0)
++ else if (comparison > 0)
+ lower = current + 1;
+ else
+ return base + current;
+@@ -241,12 +240,13 @@
return NULL;
}
@@ -25,7 +35,7 @@
*
* This routine is SLOW because of the setlocale call, so
* grab the result and cache it.
-@@ -312,7 +313,30 @@
+@@ -312,7 +312,30 @@
{ "big5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
{ "eucgbk", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */
{ "gbk", RTL_TEXTENCODING_GBK }, /* China - Simplified Chinese */
@@ -57,7 +67,7 @@
};
#elif defined(LINUX) || defined(NETBSD)
-@@ -496,7 +520,7 @@
+@@ -496,7 +519,7 @@
{ "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */
};
@@ -66,7 +76,7 @@
static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
-@@ -618,7 +642,7 @@
+@@ -618,7 +641,7 @@
return ret;
}
@@ -75,7 +85,7 @@
/*
* FIXME: the MacOS X implemetation is missing
-@@ -651,7 +675,7 @@
+@@ -651,7 +674,7 @@
return 0;
}
@@ -84,7 +94,7 @@
/*
* This implementation of osl_getTextEncodingFromLocale maps
-@@ -887,6 +911,6 @@
+@@ -887,6 +910,6 @@
return 0;
}
diff --git a/editors/openoffice.org-2-devel/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice.org-2-devel/files/patch-sal+osl+unx+nlsupport.c
index 2df241afd86b..5fab5cf69c19 100644
--- a/editors/openoffice.org-2-devel/files/patch-sal+osl+unx+nlsupport.c
+++ b/editors/openoffice.org-2-devel/files/patch-sal+osl+unx+nlsupport.c
@@ -9,7 +9,17 @@
#include <pthread.h>
#include <locale.h>
#include <langinfo.h>
-@@ -241,12 +241,13 @@
+@@ -114,8 +114,7 @@
+ comparison = _pair_compare( key, base + current );
+ if (comparison < 0)
+ upper = current;
+- else
+- if (comparison > 0)
++ else if (comparison > 0)
+ lower = current + 1;
+ else
+ return base + current;
+@@ -241,12 +240,13 @@
return NULL;
}
@@ -25,7 +35,7 @@
*
* This routine is SLOW because of the setlocale call, so
* grab the result and cache it.
-@@ -312,7 +313,30 @@
+@@ -312,7 +312,30 @@
{ "big5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
{ "eucgbk", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */
{ "gbk", RTL_TEXTENCODING_GBK }, /* China - Simplified Chinese */
@@ -57,7 +67,7 @@
};
#elif defined(LINUX) || defined(NETBSD)
-@@ -496,7 +520,7 @@
+@@ -496,7 +519,7 @@
{ "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */
};
@@ -66,7 +76,7 @@
static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
-@@ -618,7 +642,7 @@
+@@ -618,7 +641,7 @@
return ret;
}
@@ -75,7 +85,7 @@
/*
* FIXME: the MacOS X implemetation is missing
-@@ -651,7 +675,7 @@
+@@ -651,7 +674,7 @@
return 0;
}
@@ -84,7 +94,7 @@
/*
* This implementation of osl_getTextEncodingFromLocale maps
-@@ -887,6 +911,6 @@
+@@ -887,6 +910,6 @@
return 0;
}
diff --git a/editors/openoffice.org-2.0-devel/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice.org-2.0-devel/files/patch-sal+osl+unx+nlsupport.c
index 2df241afd86b..5fab5cf69c19 100644
--- a/editors/openoffice.org-2.0-devel/files/patch-sal+osl+unx+nlsupport.c
+++ b/editors/openoffice.org-2.0-devel/files/patch-sal+osl+unx+nlsupport.c
@@ -9,7 +9,17 @@
#include <pthread.h>
#include <locale.h>
#include <langinfo.h>
-@@ -241,12 +241,13 @@
+@@ -114,8 +114,7 @@
+ comparison = _pair_compare( key, base + current );
+ if (comparison < 0)
+ upper = current;
+- else
+- if (comparison > 0)
++ else if (comparison > 0)
+ lower = current + 1;
+ else
+ return base + current;
+@@ -241,12 +240,13 @@
return NULL;
}
@@ -25,7 +35,7 @@
*
* This routine is SLOW because of the setlocale call, so
* grab the result and cache it.
-@@ -312,7 +313,30 @@
+@@ -312,7 +312,30 @@
{ "big5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
{ "eucgbk", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */
{ "gbk", RTL_TEXTENCODING_GBK }, /* China - Simplified Chinese */
@@ -57,7 +67,7 @@
};
#elif defined(LINUX) || defined(NETBSD)
-@@ -496,7 +520,7 @@
+@@ -496,7 +519,7 @@
{ "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */
};
@@ -66,7 +76,7 @@
static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
-@@ -618,7 +642,7 @@
+@@ -618,7 +641,7 @@
return ret;
}
@@ -75,7 +85,7 @@
/*
* FIXME: the MacOS X implemetation is missing
-@@ -651,7 +675,7 @@
+@@ -651,7 +674,7 @@
return 0;
}
@@ -84,7 +94,7 @@
/*
* This implementation of osl_getTextEncodingFromLocale maps
-@@ -887,6 +911,6 @@
+@@ -887,6 +910,6 @@
return 0;
}
diff --git a/editors/openoffice.org-2.0/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice.org-2.0/files/patch-sal+osl+unx+nlsupport.c
index 2df241afd86b..5fab5cf69c19 100644
--- a/editors/openoffice.org-2.0/files/patch-sal+osl+unx+nlsupport.c
+++ b/editors/openoffice.org-2.0/files/patch-sal+osl+unx+nlsupport.c
@@ -9,7 +9,17 @@
#include <pthread.h>
#include <locale.h>
#include <langinfo.h>
-@@ -241,12 +241,13 @@
+@@ -114,8 +114,7 @@
+ comparison = _pair_compare( key, base + current );
+ if (comparison < 0)
+ upper = current;
+- else
+- if (comparison > 0)
++ else if (comparison > 0)
+ lower = current + 1;
+ else
+ return base + current;
+@@ -241,12 +240,13 @@
return NULL;
}
@@ -25,7 +35,7 @@
*
* This routine is SLOW because of the setlocale call, so
* grab the result and cache it.
-@@ -312,7 +313,30 @@
+@@ -312,7 +312,30 @@
{ "big5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
{ "eucgbk", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */
{ "gbk", RTL_TEXTENCODING_GBK }, /* China - Simplified Chinese */
@@ -57,7 +67,7 @@
};
#elif defined(LINUX) || defined(NETBSD)
-@@ -496,7 +520,7 @@
+@@ -496,7 +519,7 @@
{ "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */
};
@@ -66,7 +76,7 @@
static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
-@@ -618,7 +642,7 @@
+@@ -618,7 +641,7 @@
return ret;
}
@@ -75,7 +85,7 @@
/*
* FIXME: the MacOS X implemetation is missing
-@@ -651,7 +675,7 @@
+@@ -651,7 +674,7 @@
return 0;
}
@@ -84,7 +94,7 @@
/*
* This implementation of osl_getTextEncodingFromLocale maps
-@@ -887,6 +911,6 @@
+@@ -887,6 +910,6 @@
return 0;
}
diff --git a/editors/openoffice.org-2/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice.org-2/files/patch-sal+osl+unx+nlsupport.c
index 2df241afd86b..5fab5cf69c19 100644
--- a/editors/openoffice.org-2/files/patch-sal+osl+unx+nlsupport.c
+++ b/editors/openoffice.org-2/files/patch-sal+osl+unx+nlsupport.c
@@ -9,7 +9,17 @@
#include <pthread.h>
#include <locale.h>
#include <langinfo.h>
-@@ -241,12 +241,13 @@
+@@ -114,8 +114,7 @@
+ comparison = _pair_compare( key, base + current );
+ if (comparison < 0)
+ upper = current;
+- else
+- if (comparison > 0)
++ else if (comparison > 0)
+ lower = current + 1;
+ else
+ return base + current;
+@@ -241,12 +240,13 @@
return NULL;
}
@@ -25,7 +35,7 @@
*
* This routine is SLOW because of the setlocale call, so
* grab the result and cache it.
-@@ -312,7 +313,30 @@
+@@ -312,7 +312,30 @@
{ "big5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
{ "eucgbk", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */
{ "gbk", RTL_TEXTENCODING_GBK }, /* China - Simplified Chinese */
@@ -57,7 +67,7 @@
};
#elif defined(LINUX) || defined(NETBSD)
-@@ -496,7 +520,7 @@
+@@ -496,7 +519,7 @@
{ "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */
};
@@ -66,7 +76,7 @@
static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
-@@ -618,7 +642,7 @@
+@@ -618,7 +641,7 @@
return ret;
}
@@ -75,7 +85,7 @@
/*
* FIXME: the MacOS X implemetation is missing
-@@ -651,7 +675,7 @@
+@@ -651,7 +674,7 @@
return 0;
}
@@ -84,7 +94,7 @@
/*
* This implementation of osl_getTextEncodingFromLocale maps
-@@ -887,6 +911,6 @@
+@@ -887,6 +910,6 @@
return 0;
}
diff --git a/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+nlsupport.c
index 2df241afd86b..5fab5cf69c19 100644
--- a/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+nlsupport.c
+++ b/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+nlsupport.c
@@ -9,7 +9,17 @@
#include <pthread.h>
#include <locale.h>
#include <langinfo.h>
-@@ -241,12 +241,13 @@
+@@ -114,8 +114,7 @@
+ comparison = _pair_compare( key, base + current );
+ if (comparison < 0)
+ upper = current;
+- else
+- if (comparison > 0)
++ else if (comparison > 0)
+ lower = current + 1;
+ else
+ return base + current;
+@@ -241,12 +240,13 @@
return NULL;
}
@@ -25,7 +35,7 @@
*
* This routine is SLOW because of the setlocale call, so
* grab the result and cache it.
-@@ -312,7 +313,30 @@
+@@ -312,7 +312,30 @@
{ "big5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
{ "eucgbk", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */
{ "gbk", RTL_TEXTENCODING_GBK }, /* China - Simplified Chinese */
@@ -57,7 +67,7 @@
};
#elif defined(LINUX) || defined(NETBSD)
-@@ -496,7 +520,7 @@
+@@ -496,7 +519,7 @@
{ "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */
};
@@ -66,7 +76,7 @@
static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
-@@ -618,7 +642,7 @@
+@@ -618,7 +641,7 @@
return ret;
}
@@ -75,7 +85,7 @@
/*
* FIXME: the MacOS X implemetation is missing
-@@ -651,7 +675,7 @@
+@@ -651,7 +674,7 @@
return 0;
}
@@ -84,7 +94,7 @@
/*
* This implementation of osl_getTextEncodingFromLocale maps
-@@ -887,6 +911,6 @@
+@@ -887,6 +910,6 @@
return 0;
}
diff --git a/editors/openoffice.org-3-devel/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice.org-3-devel/files/patch-sal+osl+unx+nlsupport.c
index 2df241afd86b..5fab5cf69c19 100644
--- a/editors/openoffice.org-3-devel/files/patch-sal+osl+unx+nlsupport.c
+++ b/editors/openoffice.org-3-devel/files/patch-sal+osl+unx+nlsupport.c
@@ -9,7 +9,17 @@
#include <pthread.h>
#include <locale.h>
#include <langinfo.h>
-@@ -241,12 +241,13 @@
+@@ -114,8 +114,7 @@
+ comparison = _pair_compare( key, base + current );
+ if (comparison < 0)
+ upper = current;
+- else
+- if (comparison > 0)
++ else if (comparison > 0)
+ lower = current + 1;
+ else
+ return base + current;
+@@ -241,12 +240,13 @@
return NULL;
}
@@ -25,7 +35,7 @@
*
* This routine is SLOW because of the setlocale call, so
* grab the result and cache it.
-@@ -312,7 +313,30 @@
+@@ -312,7 +312,30 @@
{ "big5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
{ "eucgbk", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */
{ "gbk", RTL_TEXTENCODING_GBK }, /* China - Simplified Chinese */
@@ -57,7 +67,7 @@
};
#elif defined(LINUX) || defined(NETBSD)
-@@ -496,7 +520,7 @@
+@@ -496,7 +519,7 @@
{ "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */
};
@@ -66,7 +76,7 @@
static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
-@@ -618,7 +642,7 @@
+@@ -618,7 +641,7 @@
return ret;
}
@@ -75,7 +85,7 @@
/*
* FIXME: the MacOS X implemetation is missing
-@@ -651,7 +675,7 @@
+@@ -651,7 +674,7 @@
return 0;
}
@@ -84,7 +94,7 @@
/*
* This implementation of osl_getTextEncodingFromLocale maps
-@@ -887,6 +911,6 @@
+@@ -887,6 +910,6 @@
return 0;
}
diff --git a/editors/openoffice.org-3/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice.org-3/files/patch-sal+osl+unx+nlsupport.c
index 2df241afd86b..5fab5cf69c19 100644
--- a/editors/openoffice.org-3/files/patch-sal+osl+unx+nlsupport.c
+++ b/editors/openoffice.org-3/files/patch-sal+osl+unx+nlsupport.c
@@ -9,7 +9,17 @@
#include <pthread.h>
#include <locale.h>
#include <langinfo.h>
-@@ -241,12 +241,13 @@
+@@ -114,8 +114,7 @@
+ comparison = _pair_compare( key, base + current );
+ if (comparison < 0)
+ upper = current;
+- else
+- if (comparison > 0)
++ else if (comparison > 0)
+ lower = current + 1;
+ else
+ return base + current;
+@@ -241,12 +240,13 @@
return NULL;
}
@@ -25,7 +35,7 @@
*
* This routine is SLOW because of the setlocale call, so
* grab the result and cache it.
-@@ -312,7 +313,30 @@
+@@ -312,7 +312,30 @@
{ "big5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
{ "eucgbk", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */
{ "gbk", RTL_TEXTENCODING_GBK }, /* China - Simplified Chinese */
@@ -57,7 +67,7 @@
};
#elif defined(LINUX) || defined(NETBSD)
-@@ -496,7 +520,7 @@
+@@ -496,7 +519,7 @@
{ "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */
};
@@ -66,7 +76,7 @@
static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
-@@ -618,7 +642,7 @@
+@@ -618,7 +641,7 @@
return ret;
}
@@ -75,7 +85,7 @@
/*
* FIXME: the MacOS X implemetation is missing
-@@ -651,7 +675,7 @@
+@@ -651,7 +674,7 @@
return 0;
}
@@ -84,7 +94,7 @@
/*
* This implementation of osl_getTextEncodingFromLocale maps
-@@ -887,6 +911,6 @@
+@@ -887,6 +910,6 @@
return 0;
}
diff --git a/editors/openoffice.org-vcltesttool/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice.org-vcltesttool/files/patch-sal+osl+unx+nlsupport.c
index 2df241afd86b..5fab5cf69c19 100644
--- a/editors/openoffice.org-vcltesttool/files/patch-sal+osl+unx+nlsupport.c
+++ b/editors/openoffice.org-vcltesttool/files/patch-sal+osl+unx+nlsupport.c
@@ -9,7 +9,17 @@
#include <pthread.h>
#include <locale.h>
#include <langinfo.h>
-@@ -241,12 +241,13 @@
+@@ -114,8 +114,7 @@
+ comparison = _pair_compare( key, base + current );
+ if (comparison < 0)
+ upper = current;
+- else
+- if (comparison > 0)
++ else if (comparison > 0)
+ lower = current + 1;
+ else
+ return base + current;
+@@ -241,12 +240,13 @@
return NULL;
}
@@ -25,7 +35,7 @@
*
* This routine is SLOW because of the setlocale call, so
* grab the result and cache it.
-@@ -312,7 +313,30 @@
+@@ -312,7 +312,30 @@
{ "big5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
{ "eucgbk", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */
{ "gbk", RTL_TEXTENCODING_GBK }, /* China - Simplified Chinese */
@@ -57,7 +67,7 @@
};
#elif defined(LINUX) || defined(NETBSD)
-@@ -496,7 +520,7 @@
+@@ -496,7 +519,7 @@
{ "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */
};
@@ -66,7 +76,7 @@
static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
-@@ -618,7 +642,7 @@
+@@ -618,7 +641,7 @@
return ret;
}
@@ -75,7 +85,7 @@
/*
* FIXME: the MacOS X implemetation is missing
-@@ -651,7 +675,7 @@
+@@ -651,7 +674,7 @@
return 0;
}
@@ -84,7 +94,7 @@
/*
* This implementation of osl_getTextEncodingFromLocale maps
-@@ -887,6 +911,6 @@
+@@ -887,6 +910,6 @@
return 0;
}
diff --git a/editors/openoffice/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice/files/patch-sal+osl+unx+nlsupport.c
index 2df241afd86b..5fab5cf69c19 100644
--- a/editors/openoffice/files/patch-sal+osl+unx+nlsupport.c
+++ b/editors/openoffice/files/patch-sal+osl+unx+nlsupport.c
@@ -9,7 +9,17 @@
#include <pthread.h>
#include <locale.h>
#include <langinfo.h>
-@@ -241,12 +241,13 @@
+@@ -114,8 +114,7 @@
+ comparison = _pair_compare( key, base + current );
+ if (comparison < 0)
+ upper = current;
+- else
+- if (comparison > 0)
++ else if (comparison > 0)
+ lower = current + 1;
+ else
+ return base + current;
+@@ -241,12 +240,13 @@
return NULL;
}
@@ -25,7 +35,7 @@
*
* This routine is SLOW because of the setlocale call, so
* grab the result and cache it.
-@@ -312,7 +313,30 @@
+@@ -312,7 +312,30 @@
{ "big5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
{ "eucgbk", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */
{ "gbk", RTL_TEXTENCODING_GBK }, /* China - Simplified Chinese */
@@ -57,7 +67,7 @@
};
#elif defined(LINUX) || defined(NETBSD)
-@@ -496,7 +520,7 @@
+@@ -496,7 +519,7 @@
{ "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */
};
@@ -66,7 +76,7 @@
static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
-@@ -618,7 +642,7 @@
+@@ -618,7 +641,7 @@
return ret;
}
@@ -75,7 +85,7 @@
/*
* FIXME: the MacOS X implemetation is missing
-@@ -651,7 +675,7 @@
+@@ -651,7 +674,7 @@
return 0;
}
@@ -84,7 +94,7 @@
/*
* This implementation of osl_getTextEncodingFromLocale maps
-@@ -887,6 +911,6 @@
+@@ -887,6 +910,6 @@
return 0;
}
diff --git a/editors/openoffice/files/patch-sal::osl::unx::nlsupport.c b/editors/openoffice/files/patch-sal::osl::unx::nlsupport.c
index 2df241afd86b..5fab5cf69c19 100644
--- a/editors/openoffice/files/patch-sal::osl::unx::nlsupport.c
+++ b/editors/openoffice/files/patch-sal::osl::unx::nlsupport.c
@@ -9,7 +9,17 @@
#include <pthread.h>
#include <locale.h>
#include <langinfo.h>
-@@ -241,12 +241,13 @@
+@@ -114,8 +114,7 @@
+ comparison = _pair_compare( key, base + current );
+ if (comparison < 0)
+ upper = current;
+- else
+- if (comparison > 0)
++ else if (comparison > 0)
+ lower = current + 1;
+ else
+ return base + current;
+@@ -241,12 +240,13 @@
return NULL;
}
@@ -25,7 +35,7 @@
*
* This routine is SLOW because of the setlocale call, so
* grab the result and cache it.
-@@ -312,7 +313,30 @@
+@@ -312,7 +312,30 @@
{ "big5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
{ "eucgbk", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */
{ "gbk", RTL_TEXTENCODING_GBK }, /* China - Simplified Chinese */
@@ -57,7 +67,7 @@
};
#elif defined(LINUX) || defined(NETBSD)
-@@ -496,7 +520,7 @@
+@@ -496,7 +519,7 @@
{ "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */
};
@@ -66,7 +76,7 @@
static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
-@@ -618,7 +642,7 @@
+@@ -618,7 +641,7 @@
return ret;
}
@@ -75,7 +85,7 @@
/*
* FIXME: the MacOS X implemetation is missing
-@@ -651,7 +675,7 @@
+@@ -651,7 +674,7 @@
return 0;
}
@@ -84,7 +94,7 @@
/*
* This implementation of osl_getTextEncodingFromLocale maps
-@@ -887,6 +911,6 @@
+@@ -887,6 +910,6 @@
return 0;
}