[packages/libreoffice.git] / openoffice-i18npool.patch

--- oo/i18npool/source/collator/chaptercollator.cxx.orig	Fri May 23 18:04:06 2003
+++ oo/i18npool/source/collator/chaptercollator.cxx	Fri May 23 18:04:19 2003
@@ -2,9 +2,9 @@
  *
  *  $RCSfile$
  *
- *  $Revision$
+ *  $Revision$
  *
- *  last change: $Author$ $Date$
+ *  last change: $Author$ $Date$
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -110,7 +110,7 @@
 	if( ans != 0 )
 	    return ans;
 
-	OUString &aAddAllowed = OUString::createFromAscii("?");
+	const OUString &aAddAllowed = OUString::createFromAscii("?");
 	ParseResult res1, res2;
 	// Bug #100323#, since parseAnyToken does not take length as parameter, we have to copy
 	// it to a temp. string.
--- oo/i18npool/source/collator/collatorImpl.cxx.orig	Fri May 23 18:08:23 2003
+++ oo/i18npool/source/collator/collatorImpl.cxx	Fri May 23 18:08:56 2003
@@ -2,9 +2,9 @@
  *
  *  $RCSfile$
  *
- *  $Revision$
+ *  $Revision$
  *
- *  last change: $Author$ $Date$
+ *  last change: $Author$ $Date$
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -118,7 +118,7 @@
 sal_Int32 SAL_CALL
 CollatorImpl::loadDefaultCollator(const lang::Locale& rLocale, sal_Int32 collatorOptions) throw(RuntimeException)
 {
-    Sequence< Implementation > &imp = localedata->getCollatorImplementations(rLocale);
+    const Sequence< Implementation > &imp = localedata->getCollatorImplementations(rLocale);
     for (sal_Int16 i = 0; i < imp.getLength(); i++)
         if (imp[i].isDefault)
             return loadCollatorAlgorithm(imp[i].unoID, rLocale, collatorOptions);
@@ -156,7 +156,7 @@
 CollatorImpl::listCollatorAlgorithms( const lang::Locale& rLocale ) throw(RuntimeException)
 {
     nLocale = rLocale;
-    Sequence< Implementation > &imp = localedata->getCollatorImplementations(rLocale);
+    const Sequence< Implementation > &imp = localedata->getCollatorImplementations(rLocale);
     Sequence< OUString > list(imp.getLength());
 
     for (sal_Int32 i = 0; i < imp.getLength(); i++) {
--- oo/i18npool/source/collator/collator_icu.cxx.orig	Fri May 23 18:09:27 2003
+++ oo/i18npool/source/collator/collator_icu.cxx	Fri May 23 18:09:40 2003
@@ -2,9 +2,9 @@
  *
  *  $RCSfile$
  *
- *  $Revision$
+ *  $Revision$
  *
- *  last change: $Author$ $Date$
+ *  last change: $Author$ $Date$
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -93,8 +93,8 @@
 {
 	if (collator) {
 	    if (tranModules & TransliterationModules_IGNORE_KANA) {
-		OUString& s1 = ignore->transliterateString2String(str1, off1, len1);
-		OUString& s2 = ignore->transliterateString2String(str2, off2, len2);
+		const OUString& s1 = ignore->transliterateString2String(str1, off1, len1);
+		const OUString& s2 = ignore->transliterateString2String(str2, off2, len2);
 		return collator->compare(s1.getStr(), s1.getLength(), s2.getStr(), s2.getLength());
 	    }
 	    else
--- oo/i18npool/source/localedate/localedata.cxx.orig	Fri May 23 18:22:59 2003
+++ oo/i18npool/source/localedate/localedata.cxx	Fri May 23 18:23:21 2003
@@ -2,9 +2,9 @@
  *
  *  $RCSfile$
  *
- *  $Revision$
+ *  $Revision$
  *
- *  last change: $Author$ $Date$
+ *  last change: $Author$ $Date$
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -273,7 +273,7 @@
 		cals = getAllCalendars(loc);
 		len = cals.getLength();
 	    }
-	    OUString& id = name.getToken(0, under, index);
+	    const OUString& id = name.getToken(0, under, index);
 	    for (index = 0; index < cals.getLength(); index++) {
 		if (id.equals(cals[index].Name)) {
 		    ref_cal = cals[index];
--- oo/i18npool/source/transliteration/fullwidthToHalfwidth.cxx.orig	Fri May 23 18:24:50 2003
+++ oo/i18npool/source/transliteration/fullwidthToHalfwidth.cxx	Fri May 23 18:25:03 2003
@@ -2,9 +2,9 @@
  *
  *  $RCSfile$
  *
- *  $Revision$
+ *  $Revision$
  *
- *  last change: $Author$ $Date$
+ *  last change: $Author$ $Date$
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -90,11 +90,11 @@
   throw(RuntimeException)
 {
     // Decomposition: GA --> KA + voice-mark
-    OUString& newStr = widthfolding::decompose_ja_voiced_sound_marks (inStr, startPos, nCount, offset, useOffset);
+    const OUString& newStr = widthfolding::decompose_ja_voiced_sound_marks (inStr, startPos, nCount, offset, useOffset);
 
     // One to One mapping
     useOffset = sal_False;
-    OUString &tmp = transliteration_OneToOne::transliterate( newStr, 0, newStr.getLength(), offset);
+    const OUString &tmp = transliteration_OneToOne::transliterate( newStr, 0, newStr.getLength(), offset);
     useOffset = sal_True;
     return tmp;
 }
--- oo/i18npool/source/transliteration/halfwidthToFullwidth.cxx.orig	Fri May 23 18:25:53 2003
+++ oo/i18npool/source/transliteration/halfwidthToFullwidth.cxx	Fri May 23 18:26:05 2003
@@ -2,9 +2,9 @@
  *
  *  $RCSfile$
  *
- *  $Revision$
+ *  $Revision$
  *
- *  last change: $Author$ $Date$
+ *  last change: $Author$ $Date$
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -87,7 +87,7 @@
     sal_Bool _useOffset = useOffset;
     // One to One mapping
     useOffset = sal_False;
-    OUString& newStr = transliteration_OneToOne::transliterate( inStr, startPos, nCount, offset);
+    const OUString& newStr = transliteration_OneToOne::transliterate( inStr, startPos, nCount, offset);
     useOffset = _useOffset;
 
     // Composition: KA + voice-mark --> GA
--- oo/i18npool/source/transliteration/transliterationImpl.cxx.orig	Fri May 23 18:26:54 2003
+++ oo/i18npool/source/transliteration/transliterationImpl.cxx	Fri May 23 18:27:16 2003
@@ -2,9 +2,9 @@
  *
  *  $RCSfile$
  *
- *  $Revision$
+ *  $Revision$
  *
- *  last change: $Author$ $Date$
+ *  last change: $Author$ $Date$
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -303,7 +303,7 @@
 Sequence<OUString> SAL_CALL
 TransliterationImpl::getAvailableModules( const Locale& rLocale, sal_Int16 sType ) throw(RuntimeException)
 {
-    Sequence<OUString> &translist = localedata->getTransliterations(rLocale);
+    const Sequence<OUString> &translist = localedata->getTransliterations(rLocale);
     Sequence<OUString> &r = *new Sequence< OUString > (translist.getLength());
     Reference<XExtendedTransliteration> body;
     sal_Int32 n = 0;
@@ -532,7 +532,7 @@
     sal_Int32 j_tmp = 0;
     Sequence< OUString > ostr(MaxOutput*length);
     for (sal_Int32 j = 0; j < length; j+=2) {
-        Sequence< OUString >& temp = bodyCascade[_numCascade]->transliterateRange(inStrs[j], inStrs[j+1]);
+        const Sequence< OUString >& temp = bodyCascade[_numCascade]->transliterateRange(inStrs[j], inStrs[j+1]);
 
         for ( sal_Int32 k = 0; k < temp.getLength(); k++) {
             if ( j_tmp >= MaxOutput*length ) throw ERROR;
--- oo/i18npool/source/transliteration/transliteration_commonclass.cxx.orig	Fri May 23 18:28:06 2003
+++ oo/i18npool/source/transliteration/transliteration_commonclass.cxx	Fri May 23 18:28:18 2003
@@ -2,9 +2,9 @@
  *
  *  $RCSfile$
  *
- *  $Revision$
+ *  $Revision$
  *
- *  last change: $Author$ $Date$
+ *  last change: $Author$ $Date$
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -162,7 +162,7 @@
 {
     static Sequence < sal_Int32 > dummy_offset;
     useOffset = sal_False;
-    OUString &tmpStr = transliterate(inStr, startPos, nCount, dummy_offset);
+    const OUString &tmpStr = transliterate(inStr, startPos, nCount, dummy_offset);
     useOffset = sal_True;
     return tmpStr;
 }
--- oo/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx.orig	Fri May 23 18:29:09 2003
+++ oo/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx	Fri May 23 18:29:20 2003
@@ -2,9 +2,9 @@
  *
  *  $RCSfile$
  *
- *  $Revision$
+ *  $Revision$
  *
- *  last change: $Author$ $Date$
+ *  last change: $Author$ $Date$
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -215,7 +215,7 @@
 }
 
 static
-should_ignore( OUString s )
+int should_ignore( OUString s )
 {
 	// return true if blank or null
 	return s.compareToAscii(" ")==0 || (s.getLength()>0 && s[0]==0);
@@ -346,7 +346,7 @@
                break;
           case TRANSLITERATION:
 	       try {
- 		    OUString &tmp = OUString::valueOf( number );
+ 		    const OUString &tmp = OUString::valueOf( number );
  		    OUString transliteration;
  		    getPropertyByName(aProperties, "Transliteration", sal_True) >>= transliteration;
  		    translit->loadModuleByImplName(transliteration, aLocale);
Commit	Line	Data
5d8cbcab	1	--- oo/i18npool/source/collator/chaptercollator.cxx.orig Fri May 23 18:04:06 2003
	2	+++ oo/i18npool/source/collator/chaptercollator.cxx Fri May 23 18:04:19 2003
	3	@@ -2,9 +2,9 @@
	4	*
	5	* $RCSfile$
	6	*
	7	- * $Revision$
	8	+ * $Revision$
	9	*
	10	- * last change: $Author$ $Date$
	11	+ * last change: $Author$ $Date$
	12	*
	13	* The Contents of this file are made available subject to the terms of
	14	* either of the following licenses
	15	@@ -110,7 +110,7 @@
	16	if( ans != 0 )
	17	return ans;
	18
	19	- OUString &aAddAllowed = OUString::createFromAscii("?");
	20	+ const OUString &aAddAllowed = OUString::createFromAscii("?");
	21	ParseResult res1, res2;
	22	// Bug #100323#, since parseAnyToken does not take length as parameter, we have to copy
	23	// it to a temp. string.
1c606d23	24	--- oo/i18npool/source/collator/collatorImpl.cxx.orig Fri May 23 18:08:23 2003
	25	+++ oo/i18npool/source/collator/collatorImpl.cxx Fri May 23 18:08:56 2003
	26	@@ -2,9 +2,9 @@
	27	*
	28	* $RCSfile$
	29	*
	30	- * $Revision$
	31	+ * $Revision$
	32	*
	33	- * last change: $Author$ $Date$
	34	+ * last change: $Author$ $Date$
	35	*
	36	* The Contents of this file are made available subject to the terms of
	37	* either of the following licenses
	38	@@ -118,7 +118,7 @@
	39	sal_Int32 SAL_CALL
	40	CollatorImpl::loadDefaultCollator(const lang::Locale& rLocale, sal_Int32 collatorOptions) throw(RuntimeException)
	41	{
	42	- Sequence< Implementation > &imp = localedata->getCollatorImplementations(rLocale);
	43	+ const Sequence< Implementation > &imp = localedata->getCollatorImplementations(rLocale);
	44	for (sal_Int16 i = 0; i < imp.getLength(); i++)
	45	if (imp[i].isDefault)
	46	return loadCollatorAlgorithm(imp[i].unoID, rLocale, collatorOptions);
	47	@@ -156,7 +156,7 @@
	48	CollatorImpl::listCollatorAlgorithms( const lang::Locale& rLocale ) throw(RuntimeException)
	49	{
	50	nLocale = rLocale;
	51	- Sequence< Implementation > &imp = localedata->getCollatorImplementations(rLocale);
	52	+ const Sequence< Implementation > &imp = localedata->getCollatorImplementations(rLocale);
	53	Sequence< OUString > list(imp.getLength());
	54
	55	for (sal_Int32 i = 0; i < imp.getLength(); i++) {
	56	--- oo/i18npool/source/collator/collator_icu.cxx.orig Fri May 23 18:09:27 2003
	57	+++ oo/i18npool/source/collator/collator_icu.cxx Fri May 23 18:09:40 2003
	58	@@ -2,9 +2,9 @@
	59	*
	60	* $RCSfile$
	61	*
	62	- * $Revision$
	63	+ * $Revision$
	64	*
	65	- * last change: $Author$ $Date$
	66	+ * last change: $Author$ $Date$
	67	*
	68	* The Contents of this file are made available subject to the terms of
	69	* either of the following licenses
	70	@@ -93,8 +93,8 @@
	71	{
	72	if (collator) {
	73	if (tranModules & TransliterationModules_IGNORE_KANA) {
	74	- OUString& s1 = ignore->transliterateString2String(str1, off1, len1);
	75	- OUString& s2 = ignore->transliterateString2String(str2, off2, len2);
	76	+ const OUString& s1 = ignore->transliterateString2String(str1, off1, len1);
	77	+ const OUString& s2 = ignore->transliterateString2String(str2, off2, len2);
	78	return collator->compare(s1.getStr(), s1.getLength(), s2.getStr(), s2.getLength());
	79	}
	80	else
e7a2884a	81	--- oo/i18npool/source/localedate/localedata.cxx.orig Fri May 23 18:22:59 2003
	82	+++ oo/i18npool/source/localedate/localedata.cxx Fri May 23 18:23:21 2003
	83	@@ -2,9 +2,9 @@
	84	*
	85	* $RCSfile$
	86	*
	87	- * $Revision$
	88	+ * $Revision$
	89	*
	90	- * last change: $Author$ $Date$
	91	+ * last change: $Author$ $Date$
	92	*
	93	* The Contents of this file are made available subject to the terms of
	94	* either of the following licenses
	95	@@ -273,7 +273,7 @@
	96	cals = getAllCalendars(loc);
	97	len = cals.getLength();
	98	}
	99	- OUString& id = name.getToken(0, under, index);
	100	+ const OUString& id = name.getToken(0, under, index);
	101	for (index = 0; index < cals.getLength(); index++) {
	102	if (id.equals(cals[index].Name)) {
	103	ref_cal = cals[index];
	104	--- oo/i18npool/source/transliteration/fullwidthToHalfwidth.cxx.orig Fri May 23 18:24:50 2003
	105	+++ oo/i18npool/source/transliteration/fullwidthToHalfwidth.cxx Fri May 23 18:25:03 2003
	106	@@ -2,9 +2,9 @@
	107	*
	108	* $RCSfile$
	109	*
	110	- * $Revision$
	111	+ * $Revision$
	112	*
	113	- * last change: $Author$ $Date$
	114	+ * last change: $Author$ $Date$
	115	*
	116	* The Contents of this file are made available subject to the terms of
	117	* either of the following licenses
	118	@@ -90,11 +90,11 @@
	119	throw(RuntimeException)
	120	{
	121	// Decomposition: GA --> KA + voice-mark
	122	- OUString& newStr = widthfolding::decompose_ja_voiced_sound_marks (inStr, startPos, nCount, offset, useOffset);
	123	+ const OUString& newStr = widthfolding::decompose_ja_voiced_sound_marks (inStr, startPos, nCount, offset, useOffset);
	124
	125	// One to One mapping
	126	useOffset = sal_False;
	127	- OUString &tmp = transliteration_OneToOne::transliterate( newStr, 0, newStr.getLength(), offset);
	128	+ const OUString &tmp = transliteration_OneToOne::transliterate( newStr, 0, newStr.getLength(), offset);
	129	useOffset = sal_True;
	130	return tmp;
	131	}
	132	--- oo/i18npool/source/transliteration/halfwidthToFullwidth.cxx.orig Fri May 23 18:25:53 2003
	133	+++ oo/i18npool/source/transliteration/halfwidthToFullwidth.cxx Fri May 23 18:26:05 2003
	134	@@ -2,9 +2,9 @@
	135	*
	136	* $RCSfile$
	137	*
	138	- * $Revision$
	139	+ * $Revision$
	140	*
	141	- * last change: $Author$ $Date$
	142	+ * last change: $Author$ $Date$
	143	*
	144	* The Contents of this file are made available subject to the terms of
145	* either of the following licenses
146	@@ -87,7 +87,7 @@
147	sal_Bool _useOffset = useOffset;
148	// One to One mapping
149	useOffset = sal_False;
150	- OUString& newStr = transliteration_OneToOne::transliterate( inStr, startPos, nCount, offset);
151	+ const OUString& newStr = transliteration_OneToOne::transliterate( inStr, startPos, nCount, offset);
152	useOffset = _useOffset;
153
154	// Composition: KA + voice-mark --> GA
155	--- oo/i18npool/source/transliteration/transliterationImpl.cxx.orig Fri May 23 18:26:54 2003
156	+++ oo/i18npool/source/transliteration/transliterationImpl.cxx Fri May 23 18:27:16 2003
157	@@ -2,9 +2,9 @@
158	*
159	* $RCSfile$
160	*
161	- * $Revision$
162	+ * $Revision$
163	*
164	- * last change: $Author$ $Date$
165	+ * last change: $Author$ $Date$
166	*
167	* The Contents of this file are made available subject to the terms of
168	* either of the following licenses
169	@@ -303,7 +303,7 @@
170	Sequence<OUString> SAL_CALL
171	TransliterationImpl::getAvailableModules( const Locale& rLocale, sal_Int16 sType ) throw(RuntimeException)
172	{
173	- Sequence<OUString> &translist = localedata->getTransliterations(rLocale);
174	+ const Sequence<OUString> &translist = localedata->getTransliterations(rLocale);
175	Sequence<OUString> &r = *new Sequence< OUString > (translist.getLength());
176	Reference<XExtendedTransliteration> body;
177	sal_Int32 n = 0;
178	@@ -532,7 +532,7 @@
179	sal_Int32 j_tmp = 0;
180	Sequence< OUString > ostr(MaxOutput*length);
181	for (sal_Int32 j = 0; j < length; j+=2) {
182	- Sequence< OUString >& temp = bodyCascade[_numCascade]->transliterateRange(inStrs[j], inStrs[j+1]);
183	+ const Sequence< OUString >& temp = bodyCascade[_numCascade]->transliterateRange(inStrs[j], inStrs[j+1]);
184
185	for ( sal_Int32 k = 0; k < temp.getLength(); k++) {
186	if ( j_tmp >= MaxOutput*length ) throw ERROR;
187	--- oo/i18npool/source/transliteration/transliteration_commonclass.cxx.orig Fri May 23 18:28:06 2003
188	+++ oo/i18npool/source/transliteration/transliteration_commonclass.cxx Fri May 23 18:28:18 2003
189	@@ -2,9 +2,9 @@
190	*
191	* $RCSfile$
192	*
193	- * $Revision$
194	+ * $Revision$
195	*
196	- * last change: $Author$ $Date$
197	+ * last change: $Author$ $Date$
198	*
199	* The Contents of this file are made available subject to the terms of
200	* either of the following licenses
201	@@ -162,7 +162,7 @@
202	{
203	static Sequence < sal_Int32 > dummy_offset;
204	useOffset = sal_False;
205	- OUString &tmpStr = transliterate(inStr, startPos, nCount, dummy_offset);
206	+ const OUString &tmpStr = transliterate(inStr, startPos, nCount, dummy_offset);
207	useOffset = sal_True;
208	return tmpStr;
209	}
210	--- oo/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx.orig Fri May 23 18:29:09 2003
211	+++ oo/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx Fri May 23 18:29:20 2003
212	@@ -2,9 +2,9 @@
213	*
214	* $RCSfile$
215	*
216	- * $Revision$
217	+ * $Revision$
218	*
219	- * last change: $Author$ $Date$
220	+ * last change: $Author$ $Date$
221	*
222	* The Contents of this file are made available subject to the terms of
223	* either of the following licenses
224	@@ -215,7 +215,7 @@
225	}
226
227	static
228	-should_ignore( OUString s )
229	+int should_ignore( OUString s )
230	{
231	// return true if blank or null
232	return s.compareToAscii(" ")==0 \|\| (s.getLength()>0 && s[0]==0);
233	@@ -346,7 +346,7 @@
234	break;
235	case TRANSLITERATION:
236	try {
237	- OUString &tmp = OUString::valueOf( number );
238	+ const OUString &tmp = OUString::valueOf( number );
239	OUString transliteration;
240	getPropertyByName(aProperties, "Transliteration", sal_True) >>= transliteration;
241	translit->loadModuleByImplName(transliteration, aLocale);