summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAron Budea <aron.budea@collabora.com>2021-04-18 06:27:33 +0200
committerMichael Stahl <michael.stahl@allotropia.de>2021-04-20 10:41:45 +0200
commit678bcbe5bc3855fbda7477483c77c2cf4882d9da (patch)
treef7f92c99f1ecadd89ae915c37e3f1d32f09c4a3a
parentbump product version to 7.1.3.1.0+ (diff)
downloadcore-678bcbe5bc3855fbda7477483c77c2cf4882d9da.tar.gz
core-678bcbe5bc3855fbda7477483c77c2cf4882d9da.zip
tdf#141244 Modify DDE Link dialog was empty
Regression from de01c0c1d0f80ffec3882625d77c02ab806f6c7a. Apparently <property> entries must precede <child> ones in .ui files. Change-Id: Ie91897d126527d3b30935a46b31f0a53b2837c53 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114237 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114312 Reviewed-by: Aron Budea <aron.budea@collabora.com> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 8e324e8c9e8cfafef2f5fcebc64e7c5efb035ca2) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114278 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Tested-by: Michael Stahl <michael.stahl@allotropia.de>
-rw-r--r--sfx2/uiconfig/ui/linkeditdialog.ui40
1 files changed, 20 insertions, 20 deletions
diff --git a/sfx2/uiconfig/ui/linkeditdialog.ui b/sfx2/uiconfig/ui/linkeditdialog.ui
index 513f2ae9548d..e3822bca03dc 100644
--- a/sfx2/uiconfig/ui/linkeditdialog.ui
+++ b/sfx2/uiconfig/ui/linkeditdialog.ui
@@ -3,11 +3,6 @@
<interface domain="sfx">
<requires lib="gtk+" version="3.20"/>
<object class="GtkDialog" id="LinkEditDialog">
- <child internal-child="accessible">
- <object class="AtkObject" id="LinkEditDialog-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="linkeditdialog|extended_tip|LinkEditDialog"/>
- </object>
- </child>
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes" context="linkeditdialog|title">Modify DDE Link</property>
@@ -15,6 +10,11 @@
<property name="default_width">0</property>
<property name="default_height">0</property>
<property name="type_hint">dialog</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="LinkEditDialog-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="linkeditdialog|extended_tip|LinkEditDialog"/>
+ </object>
+ </child>
<child>
<placeholder/>
</child>
@@ -149,16 +149,16 @@
</child>
<child>
<object class="GtkEntry" id="app">
- <child internal-child="accessible">
- <object class="AtkObject" id="app-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="linkeditdialog|extended_tip|app">Lists the application that last saved the source file. %PRODUCTNAME applications have the server name soffice.</property>
- </object>
- </child>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="truncate-multiline">True</property>
<property name="activates_default">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="app-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="linkeditdialog|extended_tip|app">Lists the application that last saved the source file. %PRODUCTNAME applications have the server name soffice.</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -167,16 +167,16 @@
</child>
<child>
<object class="GtkEntry" id="file">
- <child internal-child="accessible">
- <object class="AtkObject" id="file-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="linkeditdialog|extended_tip|file">Path to the source file. Relative paths must be expressed by full URI, for example, with file://.</property>
- </object>
- </child>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="truncate-multiline">True</property>
<property name="activates_default">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="file-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="linkeditdialog|extended_tip|file">Path to the source file. Relative paths must be expressed by full URI, for example, with file://.</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -185,16 +185,16 @@
</child>
<child>
<object class="GtkEntry" id="category">
- <child internal-child="accessible">
- <object class="AtkObject" id="category-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="linkeditdialog|extended_tip|category">Lists the section or object that the link refers to in the source file. If you want, you can enter a new section or object here.</property>
- </object>
- </child>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="truncate-multiline">True</property>
<property name="activates_default">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="category-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="linkeditdialog|extended_tip|category">Lists the section or object that the link refers to in the source file. If you want, you can enter a new section or object here.</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>