Sandino Araico Sánchez
7cb5444672
Se removieron un par de parches que ya están aplicados en esta versión Backport de correcciones a cui/source/options/optjava.cxx
41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
From af3963c32c63893949a3028396af90ee7d811e5b Mon Sep 17 00:00:00 2001
|
|
From: Miklos Vajna <vmiklos@collabora.com>
|
|
Date: Wed, 21 Jun 2023 12:06:42 +0200
|
|
Subject: [PATCH 1/2] cui: fix --without-java build
|
|
|
|
This went wrong in commit 7795a2adc0a724220440dca997495043902f1384
|
|
(Allow bootstrap variables in Java user classpath settings, 2nd try,
|
|
2023-06-12), I assume that _rPath is always empty in the without-java
|
|
case.
|
|
|
|
Change-Id: I8749f5bd30b0853a76fb9ccf5d1e7a8e4e23f1ba
|
|
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153386
|
|
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
|
|
Tested-by: Jenkins
|
|
---
|
|
cui/source/options/optjava.cxx | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
|
|
index 17f128ce9b3b..7a537dfe4eed 100644
|
|
--- a/cui/source/options/optjava.cxx
|
|
+++ b/cui/source/options/optjava.cxx
|
|
@@ -940,6 +940,7 @@ void SvxJavaClassPathDlg::SetClassPath( const OUString& _rPath )
|
|
if ( m_sOldPath.isEmpty() )
|
|
m_sOldPath = _rPath;
|
|
m_xPathList->clear();
|
|
+#if HAVE_FEATURE_JAVA
|
|
if (!_rPath.isEmpty())
|
|
{
|
|
std::vector paths = jfw_convertUserPathList(_rPath);
|
|
@@ -961,6 +962,7 @@ void SvxJavaClassPathDlg::SetClassPath( const OUString& _rPath )
|
|
// select first entry
|
|
m_xPathList->select(0);
|
|
}
|
|
+#endif
|
|
SelectHdl_Impl(*m_xPathList);
|
|
}
|
|
|
|
--
|
|
2.39.3
|
|
|