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
49d43265
Kaydet (Commit)
49d43265
authored
Ock 14, 2012
tarafından
David Tardon
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
WaE: ordered comparison of pointer with integer zero
üst
c475316c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
35 additions
and
40 deletions
+35
-40
sunjavaplugin.cxx
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+35
-40
No files found.
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
Dosyayı görüntüle @
49d43265
...
@@ -294,33 +294,31 @@ javaPluginError jfw_plugin_getAllJavaInfos(
...
@@ -294,33 +294,31 @@ javaPluginError jfw_plugin_getAllJavaInfos(
}
}
}
}
if
(
arExcludeList
>
0
)
bool
bExclude
=
false
;
for
(
int
j
=
0
;
j
<
nLenList
;
j
++
)
{
{
bool
bExclude
=
false
;
rtl
::
OUString
sExVer
(
arExcludeList
[
j
])
;
for
(
int
j
=
0
;
j
<
nLenList
;
j
++
)
try
{
{
rtl
::
OUString
sExVer
(
arExcludeList
[
j
]);
if
(
cur
->
compareVersions
(
sExVer
)
==
0
)
try
{
if
(
cur
->
compareVersions
(
sExVer
)
==
0
)
{
bExclude
=
true
;
break
;
}
}
catch
(
MalformedVersionException
&
)
{
{
//The excluded version was not recognized as valid for this vendor.
bExclude
=
true
;
JFW_ENSURE
(
break
;
0
,
OUSTR
(
"[Java framework]sunjavaplugin does not know version: "
)
+
sExVer
+
OUSTR
(
" for vendor: "
)
+
cur
->
getVendor
()
+
OUSTR
(
" .Check excluded versions."
)
);
return
JFW_PLUGIN_E_WRONG_VERSION_FORMAT
;
}
}
}
}
if
(
bExclude
==
true
)
catch
(
MalformedVersionException
&
)
continue
;
{
//The excluded version was not recognized as valid for this vendor.
JFW_ENSURE
(
0
,
OUSTR
(
"[Java framework]sunjavaplugin does not know version: "
)
+
sExVer
+
OUSTR
(
" for vendor: "
)
+
cur
->
getVendor
()
+
OUSTR
(
" .Check excluded versions."
)
);
return
JFW_PLUGIN_E_WRONG_VERSION_FORMAT
;
}
}
}
if
(
bExclude
==
true
)
continue
;
vecVerifiedInfos
.
push_back
(
*
i
);
vecVerifiedInfos
.
push_back
(
*
i
);
}
}
//Now vecVerifiedInfos contains all those JREs which meet the version requirements
//Now vecVerifiedInfos contains all those JREs which meet the version requirements
...
@@ -424,28 +422,25 @@ javaPluginError jfw_plugin_getJavaInfoByPath(
...
@@ -424,28 +422,25 @@ javaPluginError jfw_plugin_getJavaInfoByPath(
return
JFW_PLUGIN_E_FAILED_VERSION
;
return
JFW_PLUGIN_E_FAILED_VERSION
;
}
}
if
(
arExcludeList
>
0
)
for
(
int
i
=
0
;
i
<
nLenList
;
i
++
)
{
{
for
(
int
i
=
0
;
i
<
nLenList
;
i
++
)
rtl
::
OUString
sExVer
(
arExcludeList
[
i
]);
int
nRes
=
0
;
try
{
{
rtl
::
OUString
sExVer
(
arExcludeList
[
i
]);
nRes
=
aVendorInfo
->
compareVersions
(
sExVer
);
int
nRes
=
0
;
}
try
catch
(
MalformedVersionException
&
)
{
{
nRes
=
aVendorInfo
->
compareVersions
(
sExVer
);
//The excluded version was not recognized as valid for this vendor.
}
JFW_ENSURE
(
catch
(
MalformedVersionException
&
)
0
,
OUSTR
(
"[Java framework]sunjavaplugin does not know version: "
)
{
+
sExVer
+
OUSTR
(
" for vendor: "
)
+
aVendorInfo
->
getVendor
()
//The excluded version was not recognized as valid for this vendor.
+
OUSTR
(
" .Check excluded versions."
)
);
JFW_ENSURE
(
return
JFW_PLUGIN_E_WRONG_VERSION_FORMAT
;
0
,
OUSTR
(
"[Java framework]sunjavaplugin does not know version: "
)
+
sExVer
+
OUSTR
(
" for vendor: "
)
+
aVendorInfo
->
getVendor
()
+
OUSTR
(
" .Check excluded versions."
)
);
return
JFW_PLUGIN_E_WRONG_VERSION_FORMAT
;
}
if
(
nRes
==
0
)
return
JFW_PLUGIN_E_FAILED_VERSION
;
}
}
if
(
nRes
==
0
)
return
JFW_PLUGIN_E_FAILED_VERSION
;
}
}
*
ppInfo
=
createJavaInfo
(
aVendorInfo
);
*
ppInfo
=
createJavaInfo
(
aVendorInfo
);
...
...
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