diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-05-15 20:09:43 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-05-15 23:29:36 +0200 |
| commit | 3bc8b14bea3c11159bdbd6fc4f9658fce3ba252e (patch) | |
| tree | 848417f74e6d7036101b039fd8d13ccdaf291666 /cui | |
| parent | dd372b444f1f1821048e197768d5095e6204a102 (diff) | |
Drop the JVM "feature" concept support
...now that 6ba74150866d71469827de9f4f19268dfa7db137
"jfw::isAccessibilitySupportDesired is obsolete" demonstrated that there is no
more need for JFW_FEATURE_ACCESSBRIDGE, the sole feature that had been provided.
* The javasettings_*.xml format still supports the <feature> tag, but it is
ignored when reading and always written as "0".
* There is no trace that "the bootstrap parameter
JFW_PLUGIN_NO_NOT_CHECK_ACCESSIBILITY" whose mention gets removed from
jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java had ever been supported.
(The only mention was 6873b3be47d71f94c38262003101576081acd241 "INTEGRATION:
CWS jre5issues (1.3.18); FILE MERGED: 2005/01/18 12:48:48 jl 1.3.18.1:
#i40879# in build environment the JRE is not tested for accessibility, because
of potential X server problems" introducing that comment.)
* The "Features" column is removed from the JRE table on the "LibreOffice -
Advance" options page.
Change-Id: I332d34b60548e7f2f852241ea8edfbee0ffcf510
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94329
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/options/optjava.cxx | 5 | ||||
| -rw-r--r-- | cui/uiconfig/ui/optadvancedpage.ui | 17 |
2 files changed, 1 insertions, 21 deletions
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 8c0060fcdd01..256328fd6e53 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -93,7 +93,6 @@ SvxJavaOptionsPage::SvxJavaOptionsPage(weld::Container* pPage, weld::DialogContr std::vector<int> aWidths; aWidths.push_back(m_xJavaList->get_checkbox_column_width()); aWidths.push_back(m_xJavaList->get_pixel_size("Sun Microsystems Inc.").Width()); - aWidths.push_back(m_xJavaList->get_pixel_size("0.0.0_00-icedtea").Width()); m_xJavaList->set_column_fixed_widths(aWidths); std::vector<int> aRadioColumns; @@ -361,10 +360,6 @@ void SvxJavaOptionsPage::AddJRE( JavaInfo const * _pInfo ) m_xJavaList->set_toggle(nPos, TRISTATE_FALSE, 0); m_xJavaList->set_text(nPos, _pInfo->sVendor, 1); m_xJavaList->set_text(nPos, _pInfo->sVersion, 2); - OUString sFeature; - if ((_pInfo->nFeatures & JFW_FEATURE_ACCESSBRIDGE) == JFW_FEATURE_ACCESSBRIDGE) - sFeature = m_sAccessibilityText; - m_xJavaList->set_text(nPos, sFeature, 3); INetURLObject aLocObj(_pInfo->sLocation); OUString sLocation = aLocObj.getFSysPath(FSysStyle::Detect); diff --git a/cui/uiconfig/ui/optadvancedpage.ui b/cui/uiconfig/ui/optadvancedpage.ui index cd4359b9ae6d..279a23a5a20d 100644 --- a/cui/uiconfig/ui/optadvancedpage.ui +++ b/cui/uiconfig/ui/optadvancedpage.ui @@ -10,8 +10,6 @@ <column type="gchararray"/> <!-- column-name text2 --> <column type="gchararray"/> - <!-- column-name text3 --> - <column type="gchararray"/> <!-- column-name id --> <column type="gchararray"/> <!-- column-name checkvis1 --> @@ -196,7 +194,7 @@ <property name="radio">True</property> </object> <attributes> - <attribute name="visible">5</attribute> + <attribute name="visible">4</attribute> <attribute name="active">0</attribute> </attributes> </child> @@ -228,19 +226,6 @@ </child> </object> </child> - <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn2"> - <property name="resizable">True</property> - <property name="spacing">6</property> - <property name="title" translatable="yes" context="optadvancedpage|features">Features</property> - <child> - <object class="GtkCellRendererText" id="cellrenderer2"/> - <attributes> - <attribute name="text">3</attribute> - </attributes> - </child> - </object> - </child> </object> </child> </object> |