From 97fc40055d33f4e56a634995446eece45caaa2f3 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Wed, 22 Feb 2012 11:57:21 +0000
Subject: not every extension's help will have help in all langs, catch that
 exception

---
 xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx | 9 ++++++++-
 xmlhelp/util/makefile.mk                              | 5 +++--
 2 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'xmlhelp')

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         \
-- 
cgit