INTEGRATION: CWS tl58 (1.28.14); FILE MERGED

2008/08/06 09:40:11 tl 1.28.14.1: #i92453# fix for extensions defining multiple dictionaries for the same locale

1 files changed, 9 insertions, 4 deletions

diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
index d6dbff7162f0..f7ad506cd34f 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: hyphenimp.cxx,v $
- * $Revision: 1.28 $
+ * $Revision: 1.29 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -198,9 +198,14 @@ Sequence< Locale > SAL_CALL Hyphenator::getLocales()
                 aSuppLocales[k++] = aTmp;
             }
 
-            //! now have one dictionary entry for each locale
-            //! (this is necessary in order to allow for several locales for one dictionary)
-            numdict = aSuppLocales.getLength();
+            //! For each dictionary and each locale we need a seperate entry.
+            //! If this results in more than one dictionary per locale than (for now)
+            //! it is undefined which dictionary gets used.
+            //! In the future the implementation should support using several dictionaries
+            //! for one locale.
+            numdict = 0;
+            for (aDictIt = aDics.begin();  aDictIt != aDics.end();  ++aDictIt)
+                numdict = numdict + aDictIt->aLocaleNames.getLength();
 
             // add dictionary information
             aDicts = new HDInfo[numdict];