Kaydet (Commit) b3fcbe7d authored tarafından Luboš Luňák's avatar Luboš Luňák

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
üst 1f1f8ac4
...@@ -31,13 +31,24 @@ ...@@ -31,13 +31,24 @@
#define HELPINDEXER_HXX #define HELPINDEXER_HXX
#include <l10ntools/dllapi.h> #include <l10ntools/dllapi.h>
#include <l10ntools/LuceneHelper.hxx>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <set> #include <set>
// I assume that TCHAR is defined as wchar_t throughout // I assume that TCHAR is defined as wchar_t throughout
namespace lucene
{
namespace document
{
class Document;
}
namespace util
{
class Reader;
}
}
class L10N_DLLPUBLIC HelpIndexer { class L10N_DLLPUBLIC HelpIndexer {
private: private:
rtl::OUString d_lang; rtl::OUString d_lang;
......
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
#define HELPSEARCH_HXX #define HELPSEARCH_HXX
#include <l10ntools/dllapi.h> #include <l10ntools/dllapi.h>
#include <l10ntools/LuceneHelper.hxx>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <vector> #include <vector>
......
...@@ -47,7 +47,6 @@ mkdir: %_DEST%\bin\help\com\sun\star\help ...@@ -47,7 +47,6 @@ mkdir: %_DEST%\bin\help\com\sun\star\help
..\inc\l10ntools\dllapi.h %_DEST%\inc\l10ntools\dllapi.h ..\inc\l10ntools\dllapi.h %_DEST%\inc\l10ntools\dllapi.h
..\inc\l10ntools\directory.hxx %_DEST%\inc\l10ntools\directory.hxx ..\inc\l10ntools\directory.hxx %_DEST%\inc\l10ntools\directory.hxx
..\inc\l10ntools\file.hxx %_DEST%\inc\l10ntools\file.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\HelpIndexer.hxx %_DEST%\inc\l10ntools\HelpIndexer.hxx
..\inc\l10ntools\HelpSearch.hxx %_DEST%\inc\l10ntools\HelpSearch.hxx ..\inc\l10ntools\HelpSearch.hxx %_DEST%\inc\l10ntools\HelpSearch.hxx
..\source\filter\merge\FCFGMerge.cfg %_DEST%\inc\l10ntools\FCFGMerge.cfg ..\source\filter\merge\FCFGMerge.cfg %_DEST%\inc\l10ntools\FCFGMerge.cfg
......
...@@ -37,6 +37,8 @@ ...@@ -37,6 +37,8 @@
#include <algorithm> #include <algorithm>
#include "LuceneHelper.hxx"
using namespace lucene::document; using namespace lucene::document;
HelpIndexer::HelpIndexer(rtl::OUString const &lang, rtl::OUString const &module, HelpIndexer::HelpIndexer(rtl::OUString const &lang, rtl::OUString const &module,
......
...@@ -34,6 +34,8 @@ ...@@ -34,6 +34,8 @@
#include <string> #include <string>
#include <iostream> #include <iostream>
#include "LuceneHelper.hxx"
int main(int argc, char **argv) { int main(int argc, char **argv) {
const std::string pLang("-lang"); const std::string pLang("-lang");
const std::string pModule("-mod"); const std::string pModule("-mod");
......
...@@ -33,6 +33,8 @@ ...@@ -33,6 +33,8 @@
#include <iostream> #include <iostream>
#include "LuceneHelper.hxx"
HelpSearch::HelpSearch(rtl::OUString const &lang, rtl::OUString const &indexDir) HelpSearch::HelpSearch(rtl::OUString const &lang, rtl::OUString const &indexDir)
: d_lang(lang) : d_lang(lang)
{ {
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
* instead of those above. * instead of those above.
*/ */
#include <l10ntools/LuceneHelper.hxx> #include "LuceneHelper.hxx"
std::vector<TCHAR> OUStringToTCHARVec(rtl::OUString const &rStr) std::vector<TCHAR> OUStringToTCHARVec(rtl::OUString const &rStr)
{ {
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include <com/sun/star/script/XInvocation.hpp> #include <com/sun/star/script/XInvocation.hpp>
#include <l10ntools/HelpSearch.hxx> #include <l10ntools/HelpSearch.hxx>
#include <CLucene.h>
#include <rtl/oustringostreaminserter.hxx> #include <rtl/oustringostreaminserter.hxx>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment