mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge from OOO_STABLE_1

Browse Source
This commit is contained in:
Sander Vesik
2002-07-29 16:51:48 +00:00
parent 779ea694af
commit ad20be6a26
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: hyphenimp.cxx,v $ * $RCSfile: hyphenimp.cxx,v $
* *
* $Revision: 1.4 $ * $Revision: 1.5 $
* *
* last change: $Author: svesik $ $Date: 2002-07-29 17:28:00 $ * last change: $Author: svesik $ $Date: 2002-07-29 17:51:48 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -388,8 +388,6 @@ Hyphenator::hyphenate( const ::rtl::OUString& aWord,
OString uTmp(OU2ENC(userdictpath + DictFN,osl_getThreadTextEncoding())); OString uTmp(OU2ENC(userdictpath + DictFN,osl_getThreadTextEncoding()));
OString sTmp(OU2ENC(dictpath + DictFN,osl_getThreadTextEncoding())); OString sTmp(OU2ENC(dictpath + DictFN,osl_getThreadTextEncoding()));
rtl_TextEncoding DictionaryEnc = L2TE( LocaleToLanguage( aLocale ) );
if ( ( dict = hnj_hyphen_load ( uTmp.getStr() ) ) == NULL ) if ( ( dict = hnj_hyphen_load ( uTmp.getStr() ) ) == NULL )
if ( ( dict = hnj_hyphen_load ( sTmp.getStr()) ) == NULL ) if ( ( dict = hnj_hyphen_load ( sTmp.getStr()) ) == NULL )
{ {
@@ -483,7 +481,6 @@ Reference< XPossibleHyphens > SAL_CALL
rtl_TextEncoding aEnc; rtl_TextEncoding aEnc;
Reference< XPossibleHyphens > xRes; Reference< XPossibleHyphens > xRes;
k = -1; k = -1;
for (int j = 0; j < numdict; j++) for (int j = 0; j < numdict; j++)
if (aLocale == aDicts[j].aLoc) k = j; if (aLocale == aDicts[j].aLoc) k = j;
@@ -525,7 +522,6 @@ Reference< XPossibleHyphens > SAL_CALL
dict = aDicts[k].aPtr; dict = aDicts[k].aPtr;
aEnc = aDicts[k].aEnc; aEnc = aDicts[k].aEnc;
OString encWord(OU2ENC(aWord, aEnc)); OString encWord(OU2ENC(aWord, aEnc));
wordlen = encWord.getLength(); wordlen = encWord.getLength();