diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-02-02 11:54:32 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-02-02 12:40:06 +0100 |
| commit | 3c51c3db186e243a7e96103242285b2854725a18 (patch) | |
| tree | e10d4479f2b9a9e831863f7ddf063622a49fdf81 /lingucomponent | |
| parent | f6c3c942976d615972674c5a5e12337d07be104c (diff) | |
Attempted fix for "Resolves: #i126762# Ignore dictionary not in specified...
...location." Caused many crashed during "make check", when aLocaleNames is a
sequence of 17 ("ar-SA", "ar-DZ", ...), but aLcoations merely a sequence of 2
(".../dict-ar/ar.aff", ".../dict-ar/ar.dic").
From comments further down below, it looks like aLocations will always contain
exactly two entries ("also both files have to be in the same directory and the
file names must only differ in the extension (.aff/.dic)"), and that all the
aLocaleNames members share the same set of aLocations ("Thus here we work-around
this by adding the same dictionary several times. Once for each of its supported
locales"), so that it would appear to be OK to just check once for the existenceof aLocations[0].
(There is a check for
if (aDictIt->aLocaleNames.getLength() > 0 &&
aDictIt->aLocations.getLength() > 0)
below, so it might be that these can be empty, or it might just be "defensive
programming." Play it safe, and check here that aLocations is not empty.)
Change-Id: I82bea6571983e397a9e164b294a5ba656b511a67
Diffstat (limited to 'lingucomponent')
| -rw-r--r-- | lingucomponent/source/spellcheck/spell/sspellimp.cxx | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx index e8ec4e8dd346..51166e6d2cad 100644 --- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx +++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx @@ -43,6 +43,7 @@ #include <osl/file.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/textenc.h> +#include <sal/log.hxx> #include <list> #include <set> @@ -153,12 +154,24 @@ Sequence< Locale > SAL_CALL SpellChecker::getLocales() { uno::Sequence< OUString > aLocaleNames( aDictIt->aLocaleNames ); uno::Sequence< OUString > aLocations( aDictIt->aLocations ); - sal_Int32 nLen2 = aLocaleNames.getLength(); - for (k = 0; k < nLen2; ++k) + SAL_WARN_IF( + aLocaleNames.hasElements() && !aLocations.hasElements(), + "lingucomponent", "no locations"); + if (aLocations.hasElements()) { - if (xAccess.is() && xAccess->exists(aLocations[k])) + if (xAccess.is() && xAccess->exists(aLocations[0])) { - aLocaleNamesSet.insert( aLocaleNames[k] ); + sal_Int32 nLen2 = aLocaleNames.getLength(); + for (k = 0; k < nLen2; ++k) + { + aLocaleNamesSet.insert( aLocaleNames[k] ); + } + } + else + { + SAL_WARN( + "lingucomponent", + "missing <" << aLocations[0] << ">"); } } } |