make sure we retain fix for fdo#40665 in clucene

l10ntools/source/help/HelpIndexer.cxx

 #include <l10ntools/HelpIndexer.hxx>
 #include "LuceneHelper.hxx"
-
-#define TODO
-
-#ifdef TODO
 #include <CLucene/analysis/LanguageBasedAnalyzer.h>
-#endif
 
 #include <rtl/string.hxx>
 #include <osl/file.hxx>
@@ -24,16 +19,17 @@ bool HelpIndexer::indexDocuments() {
 		return false;
 	}
 
-#ifdef TODO
+	rtl::OUString sLang = d_lang.getToken(0, '-');
+	bool bUseCJK =
+		sLang.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ja")) ||
+		sLang.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ko")) ||
+		sLang.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("zh"));
+
 	// Construct the analyzer appropriate for the given language
 	lucene::analysis::Analyzer *analyzer = (
-		d_lang.compareToAscii("ja") == 0 ?
+		bUseCJK ?
 		(lucene::analysis::Analyzer*)new lucene::analysis::LanguageBasedAnalyzer(L"cjk") :
 		(lucene::analysis::Analyzer*)new lucene::analysis::standard::StandardAnalyzer());
-#else
-	lucene::analysis::Analyzer *analyzer = (
-		(lucene::analysis::Analyzer*)new lucene::analysis::standard::StandardAnalyzer());
-#endif
 
 	rtl::OString indexDirStr;
 	d_indexDir.convertToString(&indexDirStr, RTL_TEXTENCODING_ASCII_US, 0);

l10ntools/source/help/LuceneHelper.cxx

@@ -24,5 +24,5 @@ rtl::OUString TCHARArrayToOUString(TCHAR const *str)
         return rtl::OUString((const sal_Unicode*)(str));
 
     // UTF-32
-    return ::OUString((const sal_uInt32*)str, wcslen(str));
+    return rtl::OUString((const sal_uInt32*)str, wcslen(str));
 }

ooo.lst.in

@@ -21,7 +21,6 @@ e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2
 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
 48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt
-48d8169acc35f97e05d8dcdfd45be7f2-lucene-2.3.2.tar.gz
 48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
 4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz
 f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz