summaryrefslogtreecommitdiffstats
path: root/desktop
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2012-02-16 12:44:56 +0000
committerMichael Meeks <michael.meeks@suse.com>2012-02-16 12:45:41 +0000
commit3675980cc1804e842b955b656fc03133ffbecea8 (patch)
tree467e892ca5d586356ec0bfaabfebdc93e38da4cb /desktop
parentjava: add STOC_FORCE_NO_JRE env. var to enable easy testing of no-JRE case. (diff)
downloadcore-3675980cc1804e842b955b656fc03133ffbecea8.tar.gz
core-3675980cc1804e842b955b656fc03133ffbecea8.zip
disable JRE warnings during help compilation on first start
Diffstat (limited to 'desktop')
-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 d121833e2d00..adc2875330f9 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"
#if !defined(ANDROID) && !defined(IOS)
#include <l10ntools/compilehelp.hxx>
@@ -420,6 +421,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 >(