diff options
| author | Sander Vesik <svesik@openoffice.org> | 2002-07-29 16:51:48 +0000 |
|---|---|---|
| committer | Sander Vesik <svesik@openoffice.org> | 2002-07-29 16:51:48 +0000 |
| commit | ad20be6a26bcf3765b0bb29f3304bb19b957397a (patch) | |
| tree | fb9c041e1b7ea562f4a115a49846e1e6cba68c6a /lingucomponent/source | |
| parent | 779ea694af5eaf155ee24c8357e9b27a78046e6e (diff) | |
Fix merge from OOO_STABLE_1
Diffstat (limited to 'lingucomponent/source')
| -rw-r--r-- | lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx index 9946b97ef954..b31028a8513c 100644 --- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx +++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx @@ -2,9 +2,9 @@ * * $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 * either of the following licenses @@ -388,8 +388,6 @@ Hyphenator::hyphenate( const ::rtl::OUString& aWord, OString uTmp(OU2ENC(userdictpath + 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 ( sTmp.getStr()) ) == NULL ) { @@ -483,7 +481,6 @@ Reference< XPossibleHyphens > SAL_CALL rtl_TextEncoding aEnc; Reference< XPossibleHyphens > xRes; - k = -1; for (int j = 0; j < numdict; j++) if (aLocale == aDicts[j].aLoc) k = j; @@ -525,7 +522,6 @@ Reference< XPossibleHyphens > SAL_CALL dict = aDicts[k].aPtr; aEnc = aDicts[k].aEnc; - OString encWord(OU2ENC(aWord, aEnc)); wordlen = encWord.getLength(); |