summaryrefslogtreecommitdiff
path: root/xmlhelp
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-02-22 11:57:21 +0000
committerCaolán McNamara <caolanm@redhat.com>2012-02-23 10:31:21 +0000
commit97fc40055d33f4e56a634995446eece45caaa2f3 (patch)
tree5edc6e400b56750bd38d2394568478ef0e618ed7 /xmlhelp
parent3ea0a0a45e7256304f95935706c8bdf3940d0b0e (diff)
not every extension's help will have help in all langs, catch that exception
Diffstat (limited to 'xmlhelp')
-rw-r--r--xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx9
-rw-r--r--xmlhelp/util/makefile.mk5
2 files changed, 11 insertions, 3 deletions
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
index 6ce46a888ff0..1241fb659266 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
@@ -35,6 +35,8 @@
#include <l10ntools/HelpSearch.hxx>
+#include <rtl/oustringostreaminserter.hxx>
+
#include <algorithm>
#include <set>
@@ -247,8 +249,13 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF
aIndexFolderResultVectorVector.push_back( pIndexFolderHitItemVector );
aIndexFolderResultVector.clear();
}
- catch( const Exception& )
+ catch (const Exception &e)
+ {
+ SAL_WARN("xmlhelp", "Exception: " << e.Message);
+ }
+ catch (CLuceneError &e)
{
+ SAL_WARN("xmlhelp", "CLuceneError: " << e.what());
}
++iDir;
diff --git a/xmlhelp/util/makefile.mk b/xmlhelp/util/makefile.mk
index caf6249270a5..90bf75b72481 100644
--- a/xmlhelp/util/makefile.mk
+++ b/xmlhelp/util/makefile.mk
@@ -59,12 +59,13 @@ SHL1STDLIBS= \
$(CPPULIB) \
$(COMPHELPERLIB) \
$(HELPLINKERLIB) \
+ $(CLUCENELIB) \
$(SALLIB) \
$(EXPATASCII3RDLIB) \
$(UNOTOOLSLIB) \
$(UCBHELPERLIB) \
- $(BERKELEYLIB) \
- $(XSLTLIB)
+ $(BERKELEYLIB) \
+ $(XSLTLIB)
SHL1LIBS = \
$(SLB)$/jaqe.lib \