INTEGRATION: CWS tl38 (1.9.32); FILE MERGED

2007/06/13 15:57:13 tl 1.9.32.1: #i74587# fix order of usage for thesaurus; user installed versions now have preference of those that came with the installation

1 files changed, 6 insertions, 3 deletions

diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
index 3b4681a85e40..ee778cb7607f 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: nthesimp.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-16 16:12:44 $
+ *  last change: $Author: obo $ $Date: 2007-07-18 09:41:49 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -260,7 +260,7 @@ Sequence< Locale > SAL_CALL Thesaurus::getLocales()
                     aTEncs[k] = 0;
 
                     aTNames[k] = aPathOpt.GetUserDictionaryPath() + A2OU("/") + A2OU(postupthes[i]->filename);
-                    aCharSetInfo[k] = new CharClass(nLoc);
+                     aCharSetInfo[k] = new CharClass(nLoc);
                     k++;
                 }
 
@@ -405,6 +405,9 @@ Sequence < Reference < ::com::sun::star::linguistic2::XMeaning > > SAL_CALL
                pTH = aThes[i];
                    aEnc = aTEncs[i];
                    pCC = aCharSetInfo[i];
+
+               if (pTH)
+                   break;
         }
     }