summaryrefslogtreecommitdiff
path: root/lingucomponent
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-09-29 12:02:40 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-09-29 12:48:40 +0100
commit61b5ee916edcf655a3127ab4aa9ce25a232d913e (patch)
treec8fd25903c05ad497d0b1ca68573d323bb0fb257 /lingucomponent
parent8de6948e4f67b65d0320f7ec08ab9ad8328b2411 (diff)
bump to libexttextcat 3.1.0, enable previously broken languages
Diffstat (limited to 'lingucomponent')
-rw-r--r--lingucomponent/source/languageguessing/guesslang.cxx16
1 files changed, 10 insertions, 6 deletions
diff --git a/lingucomponent/source/languageguessing/guesslang.cxx b/lingucomponent/source/languageguessing/guesslang.cxx
index 2318da1ce502..fff3e723b9cc 100644
--- a/lingucomponent/source/languageguessing/guesslang.cxx
+++ b/lingucomponent/source/languageguessing/guesslang.cxx
@@ -51,6 +51,8 @@
#include <sal/macros.h>
+#include <libtextcat/textcat.h>
+
using namespace ::rtl;
using namespace ::osl;
using namespace ::cppu;
@@ -156,6 +158,7 @@ void LangGuess_Impl::EnsureInitialized()
SetFingerPrintsDB( aPhysPath );
+#if !defined(EXTTEXTCAT_VERSION_MAJOR)
//
// disable currently not functional languages...
//
@@ -166,12 +169,12 @@ void LangGuess_Impl::EnsureInitialized()
};
LangCountry aDisable[] =
{
- {"gv", ""}, {"sco", ""}, // no lang-id available yet...
-// {"hy", ""}, {"drt", ""}, // 0 bytes fingerprints...
- {"zh", "CN"}, {"zh", "TW"}, {"ja", ""}, {"ko", ""}, // not yet correct functional...
- {"ka", ""}, {"hi", ""}, {"mr", ""}, {"ne", ""},
- {"sa", ""}, {"ta", ""}, {"th", ""},
- {"qu", ""}, {"yi", ""}
+ // not functional in modified libtextcat, but fixed in >= libexttextcat 3.1.0
+ // which is the first with EXTTEXTCAT_VERSION_MAJOR defined
+
+ {"sco", ""}, {"zh", "CN"}, {"zh", "TW"}, {"ja", ""}, {"ko", ""},
+ {"ka", ""}, {"hi", ""}, {"mr", ""}, {"ne", ""}, {"sa", ""},
+ {"ta", ""}, {"th", ""}, {"qu", ""}, {"yi", ""}
};
sal_Int32 nNum = SAL_N_ELEMENTS(aDisable);
Sequence< Locale > aDisableSeq( nNum );
@@ -185,6 +188,7 @@ void LangGuess_Impl::EnsureInitialized()
}
disableLanguages( aDisableSeq );
DBG_ASSERT( nNum == getDisabledLanguages().getLength(), "size mismatch" );
+#endif
}
}