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
10 - * last change: $Author$ $Date$
11 + * last change: $Author$ $Date$
13 * The Contents of this file are made available subject to the terms of
14 * either of the following licenses
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.
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
33 - * last change: $Author$ $Date$
34 + * last change: $Author$ $Date$
36 * The Contents of this file are made available subject to the terms of
37 * either of the following licenses
40 CollatorImpl::loadDefaultCollator(const lang::Locale& rLocale, sal_Int32 collatorOptions) throw(RuntimeException)
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++)
46 return loadCollatorAlgorithm(imp[i].unoID, rLocale, collatorOptions);
48 CollatorImpl::listCollatorAlgorithms( const lang::Locale& rLocale ) throw(RuntimeException)
51 - Sequence< Implementation > &imp = localedata->getCollatorImplementations(rLocale);
52 + const Sequence< Implementation > &imp = localedata->getCollatorImplementations(rLocale);
53 Sequence< OUString > list(imp.getLength());
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
65 - * last change: $Author$ $Date$
66 + * last change: $Author$ $Date$
68 * The Contents of this file are made available subject to the terms of
69 * either of the following licenses
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());
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
90 - * last change: $Author$ $Date$
91 + * last change: $Author$ $Date$
93 * The Contents of this file are made available subject to the terms of
94 * either of the following licenses
96 cals = getAllCalendars(loc);
97 len = cals.getLength();
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
113 - * last change: $Author$ $Date$
114 + * last change: $Author$ $Date$
116 * The Contents of this file are made available subject to the terms of
117 * either of the following licenses
119 throw(RuntimeException)
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);
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;
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
141 - * last change: $Author$ $Date$
142 + * last change: $Author$ $Date$
144 * The Contents of this file are made available subject to the terms of
145 * either of the following licenses
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;
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
164 - * last change: $Author$ $Date$
165 + * last change: $Author$ $Date$
167 * The Contents of this file are made available subject to the terms of
168 * either of the following licenses
170 Sequence<OUString> SAL_CALL
171 TransliterationImpl::getAvailableModules( const Locale& rLocale, sal_Int16 sType ) throw(RuntimeException)
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;
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]);
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
196 - * last change: $Author$ $Date$
197 + * last change: $Author$ $Date$
199 * The Contents of this file are made available subject to the terms of
200 * either of the following licenses
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;
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
219 - * last change: $Author$ $Date$
220 + * last change: $Author$ $Date$
222 * The Contents of this file are made available subject to the terms of
223 * either of the following licenses
228 -should_ignore( OUString s )
229 +int should_ignore( OUString s )
231 // return true if blank or null
232 return s.compareToAscii(" ")==0 || (s.getLength()>0 && s[0]==0);
235 case TRANSLITERATION:
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);