Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
55892c6b
Kaydet (Commit)
55892c6b
authored
Şub 20, 2012
tarafından
Stephan Bergmann
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Clean up work around spurious warning about missing JRE
üst
65a3ec97
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
30 additions
and
5 deletions
+30
-5
dp_help.cxx
desktop/source/deployment/registry/help/dp_help.cxx
+30
-5
No files found.
desktop/source/deployment/registry/help/dp_help.cxx
Dosyayı görüntüle @
55892c6b
...
...
@@ -37,8 +37,9 @@
#include "ucbhelper/content.hxx"
#include "comphelper/servicedecl.hxx"
#include "svl/inettype.hxx"
#include "
unotools/pathoptions
.hxx"
#include "
svtools/javainteractionhandler
.hxx"
#include "uno/current_context.hxx"
#include "unotools/pathoptions.hxx"
#if !defined(ANDROID) && !defined(IOS)
#include <l10ntools/compilehelp.hxx>
...
...
@@ -61,6 +62,29 @@ namespace backend {
namespace
help
{
namespace
{
// A current context that filters out java-vm.interaction-handler:
class
NonJavaCurrentContext
:
public
cppu
::
WeakImplHelper1
<
XCurrentContext
>
{
public
:
NonJavaCurrentContext
(
Reference
<
XCurrentContext
>
const
&
parent
)
:
parent_
(
parent
)
{}
virtual
Any
SAL_CALL
getValueByName
(
rtl
::
OUString
const
&
Name
)
throw
(
RuntimeException
);
private
:
Reference
<
XCurrentContext
>
parent_
;
};
Any
NonJavaCurrentContext
::
getValueByName
(
rtl
::
OUString
const
&
Name
)
throw
(
RuntimeException
)
{
return
(
Name
.
equalsAsciiL
(
RTL_CONSTASCII_STRINGPARAM
(
JAVA_INTERACTION_HANDLER_NAME
))
||
!
parent_
.
is
())
?
Any
()
:
parent_
->
getValueByName
(
Name
);
}
//==============================================================================
class
BackendImpl
:
public
::
dp_registry
::
backend
::
PackageRegistryBackend
{
...
...
@@ -421,10 +445,11 @@ 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
);
// Ignore the missing JRE scenario on upgrade/first-start
// without horrible end-user warnings that are ignorable,
// and cause grief:
ContextLayer
l
(
new
NonJavaCurrentContext
(
getCurrentContext
()));
try
{
xInvocation
=
Reference
<
script
::
XInvocation
>
(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment