cui/uiconfig/ui/accelconfigpage.ui | 227 ++++++++++----------
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 2
2 files changed, 116 insertions(+), 113 deletions(-)
New commits:
commit 93e234c45c62af9d57041de676d888f7695ac0e8
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Fri Sep 23 14:01:48 2022 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Fri Sep 23 15:52:21 2022 +0200
Fix a misuse of two-argument std string_view rfind
...introduced in 655b6c2f46a73d9893ba8e6b572731a5890a4f72
"loplugin:stringviewparam". Unlike its O[U]String lastIndexOf(x, n)
counterpart (which looks for the last x whose end position, exclusive, is
<= n),
string_view rfind(x, n) looks for the last x whose start position,
inclusive, is
<= n. (So here would have left slash unchanged.) (And the seemingly
simpler
jvm_dll.rfind('\\', slash - 1)
would fail when slash is zero, as in that case it would call rfind with a
second
argument of npos, i.e., search for the last '\\' in the complete jvm_dll.)
Change-Id: I148a5db860d4b9e9d58a4a8847880a7a7020c5a5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140486
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index 45feea3b1db1..77ea93d69592 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -486,7 +486,7 @@ static void load_msvcr(std::u16string_view jvm_dll,
std::u16string_view msvcr)
// Then check if msvcr71.dll is in the parent folder of where
// jvm.dll is. That is currently (1.6.0_22) as far as I know the
// normal case.
- slash = jvm_dll.rfind('\\', slash);
+ slash = jvm_dll.substr(0, slash).rfind('\\');
if (slash == std::u16string_view::npos)
return;
commit e14a6b3f37c0f462afcc9534c8d4a90b430a6d80
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Sep 23 12:52:14 2022 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Sep 23 15:52:08 2022 +0200
resave with latest glade
Change-Id: I461177666d04db2250e3f9cd617551343db832b1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140487
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/cui/uiconfig/ui/accelconfigpage.ui
b/cui/uiconfig/ui/accelconfigpage.ui
index 5c7d58e55120..6aef2238c5a3 100644
--- a/cui/uiconfig/ui/accelconfigpage.ui
+++ b/cui/uiconfig/ui/accelconfigpage.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.38.2 -->
<interface domain="cui">
<requires lib="gtk+" version="3.20"/>
<object class="GtkTreeStore" id="liststore1">
@@ -44,48 +44,50 @@
<column type="gchararray"/>
</columns>
</object>
+ <!-- n-columns=1 n-rows=2 -->
<object class="GtkGrid" id="AccelConfigPage">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="border_width">6</property>
- <property name="row_spacing">12</property>
+ <property name="border-width">6</property>
+ <property name="row-spacing">12</property>
<child>
+ <!-- n-columns=2 n-rows=1 -->
<object class="GtkGrid" id="grid3">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="column_spacing">12</property>
+ <property name="column-spacing">12</property>
<child>
<object class="GtkFrame" id="frame4">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="label-xalign">0</property>
+ <property name="shadow-type">none</property>
<child>
<object class="GtkScrolledWindow">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="margin_top">6</property>
+ <property name="can-focus">True</property>
+ <property name="margin-top">6</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="shadow_type">in</property>
+ <property name="shadow-type">in</property>
<child>
<object class="GtkTreeView" id="shortcuts">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes"
context="accelconfigpage|tooltip|shortcuts">To quickly find a shortcut in this
list, simply press the key combination.</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
+ <property name="tooltip-text" translatable="yes"
context="accelconfigpage|tooltip|shortcuts">To quickly find a shortcut in this
list, simply press the key combination.</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="model">liststore3</property>
- <property name="headers_visible">False</property>
- <property name="search_column">0</property>
- <property name="show_expanders">False</property>
+ <property name="headers-visible">False</property>
+ <property name="search-column">0</property>
+ <property name="show-expanders">False</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="Macro Library
List-selection2"/>
</child>
@@ -127,40 +129,40 @@ To quickly find a shortcut in this list, simply press the
key combination.</prop
<child type="label">
<object class="GtkLabel" id="label21">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="accelconfigpage|label21">Shortcu_t Keys</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">shortcuts</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">shortcuts</property>
</object>
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="box17">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkBox" id="box18">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkRadioButton" id="office">
<property name="label" translatable="yes"
context="accelconfigpage|office">%PRODUCTNAME</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
<property name="active">True</property>
- <property name="draw_indicator">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="office-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="accelconfigpage|extended_tip|office">Displays
shortcut keys that are common to all the office suite applications.</property>
@@ -177,10 +179,10 @@ To quickly find a shortcut in this list, simply press the
key combination.</prop
<object class="GtkRadioButton" id="module">
<property name="label" translatable="yes"
context="accelconfigpage|module">$(MODULE)</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<property name="group">office</property>
<child internal-child="accessible">
<object class="AtkObject" id="module-atkobject">
@@ -204,18 +206,18 @@ To quickly find a shortcut in this list, simply press the
key combination.</prop
<child>
<object class="GtkButtonBox" id="buttonbox1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
- <property name="layout_style">start</property>
+ <property name="layout-style">start</property>
<child>
<object class="GtkButton" id="change">
<property name="label" translatable="yes"
context="accelconfigpage|change">_Modify</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
+ <property name="use-underline">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="change-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="accelconfigpage|extended_tip|change">Assigns the
key combination selected in the Shortcut keys list to the command selected in
the Function list.</property>
@@ -232,8 +234,8 @@ To quickly find a shortcut in this list, simply press the
key combination.</prop
<object class="GtkButton" id="delete">
<property name="label" translatable="yes"
context="stock">_Delete</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
<property name="use-underline">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="delete-atkobject">
@@ -251,9 +253,9 @@ To quickly find a shortcut in this list, simply press the
key combination.</prop
<object class="GtkButton" id="load">
<property name="label" translatable="yes"
context="accelconfigpage|load">_Load...</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
+ <property name="use-underline">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="load-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="accelconfigpage|extended_tip|load">Replaces the
shortcut key configuration with one that was previously saved.</property>
@@ -271,9 +273,9 @@ To quickly find a shortcut in this list, simply press the
key combination.</prop
<object class="GtkButton" id="save">
<property name="label" translatable="yes"
context="accelconfigpage|save">_Save...</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
+ <property name="use-underline">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="save-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="accelconfigpage|extended_tip|save">Saves the
current shortcut key configuration, so that you can load it later.</property>
@@ -291,10 +293,10 @@ To quickly find a shortcut in this list, simply press the
key combination.</prop
<object class="GtkButton" id="reset">
<property name="label" translatable="yes"
context="stock">_Reset</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_underline">True</property>
- <property name="tooltip_text" translatable="yes"
context="accelconfigpage|tooltip|reset">Unsaved modifications to shortcut keys
are reverted.</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
+ <property name="tooltip-text" translatable="yes"
context="accelconfigpage|tooltip|reset">Unsaved modifications to shortcut keys
are reverted.</property>
+ <property name="use-underline">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="reset-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="accelconfigpage|extended_tip|reset">Revert any
changes made to keyboard shortcuts to the assignments that were present when
this dialog was opened.</property>
@@ -317,39 +319,39 @@ To quickly find a shortcut in this list, simply press the
key combination.</prop
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
</packing>
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame5">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="label-xalign">0</property>
+ <property name="shadow-type">none</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_top">6</property>
+ <property name="can-focus">False</property>
+ <property name="margin-top">6</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkEntry" id="searchEntry">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="margin_bottom">5</property>
- <property name="placeholder_text" translatable="yes"
context="accelconfigpage|searchEntry">Type to search</property>
+ <property name="can-focus">True</property>
+ <property name="margin-bottom">5</property>
<property name="truncate-multiline">True</property>
+ <property name="placeholder-text" translatable="yes"
context="accelconfigpage|searchEntry">Type to search</property>
<child internal-child="accessible">
<object class="AtkObject" id="searchEntry-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="accelconfigpage|extended_tip|searchEntry">Type here
to search in the list of functions.</property>
@@ -363,72 +365,73 @@ To quickly find a shortcut in this list, simply press the
key combination.</prop
</packing>
</child>
<child>
+ <!-- n-columns=3 n-rows=2 -->
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
+ <property name="row-spacing">6</property>
+ <property name="column-spacing">12</property>
<child>
<object class="GtkLabel" id="label23">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="accelconfigpage|label23">_Category</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">category</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">category</property>
<property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label24">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="accelconfigpage|label24">_Function</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">function</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">function</property>
<property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label25">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="accelconfigpage|label25">_Keys</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">keys</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">keys</property>
<property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">2</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkScrolledWindow">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="shadow_type">in</property>
+ <property name="shadow-type">in</property>
<child>
<object class="GtkTreeView" id="category">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="model">liststore1</property>
- <property name="headers_visible">False</property>
- <property name="search_column">0</property>
+ <property name="headers-visible">False</property>
+ <property name="search-column">0</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="Macro Library
List-selection1"/>
</child>
@@ -453,29 +456,29 @@ To quickly find a shortcut in this list, simply press the
key combination.</prop
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkScrolledWindow">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="shadow_type">in</property>
+ <property name="shadow-type">in</property>
<child>
<object class="GtkTreeView" id="function">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
+ <property name="has-tooltip">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="model">liststore2</property>
- <property name="headers_visible">False</property>
- <property name="search_column">0</property>
- <property name="show_expanders">False</property>
+ <property name="headers-visible">False</property>
+ <property name="search-column">0</property>
+ <property name="show-expanders">False</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="Macro Library
List-selection3"/>
</child>
@@ -500,28 +503,28 @@ To quickly find a shortcut in this list, simply press the
key combination.</prop
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkScrolledWindow">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="shadow_type">in</property>
+ <property name="shadow-type">in</property>
<child>
<object class="GtkTreeView" id="keys">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="model">liststore4</property>
- <property name="headers_visible">False</property>
- <property name="search_column">0</property>
- <property name="show_expanders">False</property>
+ <property name="headers-visible">False</property>
+ <property name="search-column">0</property>
+ <property name="show-expanders">False</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="Macro Library
List-selection4"/>
</child>
@@ -546,8 +549,8 @@ To quickly find a shortcut in this list, simply press the
key combination.</prop
</child>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">2</property>
+ <property name="top-attach">1</property>
</packing>
</child>
</object>
@@ -562,16 +565,16 @@ To quickly find a shortcut in this list, simply press the
key combination.</prop
<child type="label">
<object class="GtkLabel" id="label22">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="accelconfigpage|label22">F_unctions</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">searchEntry</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">searchEntry</property>
</object>
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child internal-child="accessible">
