[Libreoffice-commits] .: l10ntools/inc l10ntools/prj l10ntools/source xmlhelp/source
Lubos Lunak
llunak at kemper.freedesktop.org
Mon Apr 23 22:45:00 PDT 2012
l10ntools/inc/l10ntools/HelpIndexer.hxx | 13 ++++
l10ntools/inc/l10ntools/HelpSearch.hxx | 1
l10ntools/inc/l10ntools/LuceneHelper.hxx | 53 ------------------
l10ntools/prj/d.lst | 1
l10ntools/source/help/HelpIndexer.cxx | 2
l10ntools/source/help/HelpIndexer_main.cxx | 2
l10ntools/source/help/HelpSearch.cxx | 2
l10ntools/source/help/LuceneHelper.cxx | 2
l10ntools/source/help/LuceneHelper.hxx | 53 ++++++++++++++++++
xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx | 1
10 files changed, 73 insertions(+), 57 deletions(-)
New commits:
commit b3fcbe7d2b163dbc7c6e68f6db214d3df47fda57
Author: Luboš Luňák <l.lunak at suse.cz>
Date: Tue Apr 24 07:42:07 2012 +0200
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
diff --git a/l10ntools/inc/l10ntools/HelpIndexer.hxx b/l10ntools/inc/l10ntools/HelpIndexer.hxx
index df492bb..f81bca3 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 1a1b3c0..e4a846a 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/inc/l10ntools/LuceneHelper.hxx b/l10ntools/inc/l10ntools/LuceneHelper.hxx
deleted file mode 100644
index c990647..0000000
--- a/l10ntools/inc/l10ntools/LuceneHelper.hxx
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License or as specified alternatively below. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Major Contributor(s):
- * Copyright (C) 2012 Gert van Valkenhoef <g.h.m.van.valkenhoef at rug.nl>
- * (initial developer)
- *
- * All Rights Reserved.
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
- */
-
-#ifndef LUCENEHELPER_HXX
-#define LUCENEHELPER_HXX
-
-#if defined _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4068 4263 4264 4266)
-#endif
-
-#include <CLucene.h>
-#include <CLucene/analysis/LanguageBasedAnalyzer.h>
-
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
-
-#include <rtl/ustring.hxx>
-#include <vector>
-
-std::vector<TCHAR> OUStringToTCHARVec(rtl::OUString const &rStr);
-rtl::OUString TCHARArrayToOUString(TCHAR const *str);
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/l10ntools/prj/d.lst b/l10ntools/prj/d.lst
index 99aac56..e9329dc 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 608c6cb..3c595b4 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 cd30bbf..bf42a4c 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 44c4cb6..10b57db 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 9ab708a..bee9090 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/source/help/LuceneHelper.hxx b/l10ntools/source/help/LuceneHelper.hxx
new file mode 100644
index 0000000..c990647
--- /dev/null
+++ b/l10ntools/source/help/LuceneHelper.hxx
@@ -0,0 +1,53 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * Copyright (C) 2012 Gert van Valkenhoef <g.h.m.van.valkenhoef at rug.nl>
+ * (initial developer)
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#ifndef LUCENEHELPER_HXX
+#define LUCENEHELPER_HXX
+
+#if defined _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4068 4263 4264 4266)
+#endif
+
+#include <CLucene.h>
+#include <CLucene/analysis/LanguageBasedAnalyzer.h>
+
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
+
+#include <rtl/ustring.hxx>
+#include <vector>
+
+std::vector<TCHAR> OUStringToTCHARVec(rtl::OUString const &rStr);
+rtl::OUString TCHARArrayToOUString(TCHAR const *str);
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
index 9ccd6f4..ca333ea 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
@@ -34,6 +34,7 @@
#include <com/sun/star/script/XInvocation.hpp>
#include <l10ntools/HelpSearch.hxx>
+#include <CLucene.h>
#include <rtl/oustringostreaminserter.hxx>
More information about the Libreoffice-commits
mailing list