do not export usage of CLucene headers outside of l10ntools

that'd require CLUCENE_CFLAGS everywhere where it's used, and it's not necessary

8 files changed, 19 insertions, 4 deletions

diff --git a/l10ntools/inc/l10ntools/HelpIndexer.hxx b/l10ntools/inc/l10ntools/HelpIndexer.hxx
index df492bb1a76e..f81bca3fe393 100644
--- a/l10ntools/inc/l10ntools/HelpIndexer.hxx
+++ b/l10ntools/inc/l10ntools/HelpIndexer.hxx
@@ -31,13 +31,24 @@
 #define HELPINDEXER_HXX
 
 #include <l10ntools/dllapi.h>
-#include <l10ntools/LuceneHelper.hxx>
 
 #include <rtl/ustring.hxx>
 #include <set>
 
 // I assume that TCHAR is defined as wchar_t throughout
 
+namespace lucene
+{
+namespace document
+{
+class Document;
+}
+namespace util
+{
+class Reader;
+}
+}
+
 class L10N_DLLPUBLIC HelpIndexer {
 	private:
 		rtl::OUString d_lang;
diff --git a/l10ntools/inc/l10ntools/HelpSearch.hxx b/l10ntools/inc/l10ntools/HelpSearch.hxx
index 1a1b3c097c60..e4a846a926dd 100644
--- a/l10ntools/inc/l10ntools/HelpSearch.hxx
+++ b/l10ntools/inc/l10ntools/HelpSearch.hxx
@@ -31,7 +31,6 @@
 #define HELPSEARCH_HXX
 
 #include <l10ntools/dllapi.h>
-#include <l10ntools/LuceneHelper.hxx>
 
 #include <rtl/ustring.hxx>
 #include <vector>
diff --git a/l10ntools/prj/d.lst b/l10ntools/prj/d.lst
index 99aac566e3ca..e9329dc93855 100644
--- a/l10ntools/prj/d.lst
+++ b/l10ntools/prj/d.lst
@@ -47,7 +47,6 @@ mkdir: %_DEST%\bin\help\com\sun\star\help
 ..\inc\l10ntools\dllapi.h %_DEST%\inc\l10ntools\dllapi.h
 ..\inc\l10ntools\directory.hxx %_DEST%\inc\l10ntools\directory.hxx
 ..\inc\l10ntools\file.hxx %_DEST%\inc\l10ntools\file.hxx
-..\inc\l10ntools\LuceneHelper.hxx %_DEST%\inc\l10ntools\LuceneHelper.hxx
 ..\inc\l10ntools\HelpIndexer.hxx %_DEST%\inc\l10ntools\HelpIndexer.hxx
 ..\inc\l10ntools\HelpSearch.hxx %_DEST%\inc\l10ntools\HelpSearch.hxx
 ..\source\filter\merge\FCFGMerge.cfg  %_DEST%\inc\l10ntools\FCFGMerge.cfg
diff --git a/l10ntools/source/help/HelpIndexer.cxx b/l10ntools/source/help/HelpIndexer.cxx
index 608c6cb19ca7..3c595b4b3bd6 100644
--- a/l10ntools/source/help/HelpIndexer.cxx
+++ b/l10ntools/source/help/HelpIndexer.cxx
@@ -37,6 +37,8 @@
 
 #include <algorithm>
 
+#include "LuceneHelper.hxx"
+
 using namespace lucene::document;
 
 HelpIndexer::HelpIndexer(rtl::OUString const &lang, rtl::OUString const &module,
diff --git a/l10ntools/source/help/HelpIndexer_main.cxx b/l10ntools/source/help/HelpIndexer_main.cxx
index cd30bbfcc0b6..bf42a4cdd84d 100644
--- a/l10ntools/source/help/HelpIndexer_main.cxx
+++ b/l10ntools/source/help/HelpIndexer_main.cxx
@@ -34,6 +34,8 @@
 #include <string>
 #include <iostream>
 
+#include "LuceneHelper.hxx"
+
 int main(int argc, char **argv) {
     const std::string pLang("-lang");
     const std::string pModule("-mod");
diff --git a/l10ntools/source/help/HelpSearch.cxx b/l10ntools/source/help/HelpSearch.cxx
index 44c4cb669cbd..10b57dbce741 100644
--- a/l10ntools/source/help/HelpSearch.cxx
+++ b/l10ntools/source/help/HelpSearch.cxx
@@ -33,6 +33,8 @@
 
 #include <iostream>
 
+#include "LuceneHelper.hxx"
+
 HelpSearch::HelpSearch(rtl::OUString const &lang, rtl::OUString const &indexDir)
     : d_lang(lang)
 {
diff --git a/l10ntools/source/help/LuceneHelper.cxx b/l10ntools/source/help/LuceneHelper.cxx
index 9ab708a75b71..bee9090cc2b7 100644
--- a/l10ntools/source/help/LuceneHelper.cxx
+++ b/l10ntools/source/help/LuceneHelper.cxx
@@ -27,7 +27,7 @@
  * instead of those above.
  */
 
-#include <l10ntools/LuceneHelper.hxx>
+#include "LuceneHelper.hxx"
 
 std::vector<TCHAR> OUStringToTCHARVec(rtl::OUString const &rStr)
 {
diff --git a/l10ntools/inc/l10ntools/LuceneHelper.hxx b/l10ntools/source/help/LuceneHelper.hxx
index c990647a1a9b..c990647a1a9b 100644
--- a/l10ntools/inc/l10ntools/LuceneHelper.hxx
+++ b/l10ntools/source/help/LuceneHelper.hxx