summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2012-02-16 12:44:56 +0000
committerPetr Mladek <pmladek@suse.cz>2012-02-20 15:00:04 +0100
commit5004de693a95ba3678ec41f25bb55beef4a32ed1 (patch)
treec5ba97d7681a02044640f8d6006bf085cb1b4c42
parent92b7c7db8356beef47df682b993e1aaeeb9a734c (diff)
disable JRE warnings during help compilation on first start
Signed-off-by: Petr Mladek <pmladek@suse.cz>
-rw-r--r--desktop/source/deployment/registry/help/dp_help.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index 9d96328f93be..ba1009c25379 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -38,6 +38,7 @@
#include "comphelper/servicedecl.hxx"
#include "svl/inettype.hxx"
#include "unotools/pathoptions.hxx"
+#include "uno/current_context.hxx"
#include <l10ntools/compilehelp.hxx>
#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
@@ -417,6 +418,10 @@ void BackendImpl::implProcessHelp(
Reference< script::XInvocation > xInvocation;
if( xContext.is() )
{
+ // Ignore the missing JRE scenario on upgrade/first-start without
+ // horrible end-user warnings that are ignorable,and cause grief.
+ Reference< XCurrentContext > xNoContext;
+ com::sun::star::uno::ContextLayer dummyLayer( xNoContext );
try
{
xInvocation = Reference< script::XInvocation >(