solenv/sanitizers/ui/svx.suppr | 4 ++--
svx/source/sidebar/graphic/GraphicPropertyPanel.cxx | 2 +-
svx/uiconfig/ui/sidebargraphic.ui | 10 +++++-----
3 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 1bf2d22254a60b1cc1fe63fd50d71d389377d1da
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Thu Nov 28 10:48:55 2019 +0100
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Thu Nov 28 14:05:48 2019 +0100
jsdialog: rename duplicated ui object settransparency
We had two elements with the same name (one in the area,
one in a graphic context) - that caused bottom panel
in online not work correctly.
Change-Id: I41b9604522157e2c31e68e40c49e42ff2ccdb280
Reviewed-on: https://gerrit.libreoffice.org/83974
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
diff --git a/solenv/sanitizers/ui/svx.suppr b/solenv/sanitizers/ui/svx.suppr
index 333fa3ff4c68..e921178d5aa9 100644
--- a/solenv/sanitizers/ui/svx.suppr
+++ b/solenv/sanitizers/ui/svx.suppr
@@ -142,8 +142,8 @@
svx/uiconfig/ui/sidebargraphic.ui://GtkSpinButton[@id='setcontrast:%'] missing-l
svx/uiconfig/ui/sidebargraphic.ui://GtkSpinButton[@id='setcontrast:%']
labelled-by-and-mnemonic
svx/uiconfig/ui/sidebargraphic.ui://GtkComboBoxText[@id='setcolormode']
missing-label-for
svx/uiconfig/ui/sidebargraphic.ui://GtkComboBoxText[@id='setcolormode']
labelled-by-and-mnemonic
-svx/uiconfig/ui/sidebargraphic.ui://GtkSpinButton[@id='settransparency:%']
missing-label-for
-svx/uiconfig/ui/sidebargraphic.ui://GtkSpinButton[@id='settransparency:%']
labelled-by-and-mnemonic
+svx/uiconfig/ui/sidebargraphic.ui://GtkSpinButton[@id='setgraphtransparency:%']
missing-label-for
+svx/uiconfig/ui/sidebargraphic.ui://GtkSpinButton[@id='setgraphtransparency:%']
labelled-by-and-mnemonic
svx/uiconfig/ui/sidebarline.ui://GtkLabel[@id='widthlabel'] orphan-label
svx/uiconfig/ui/sidebarline.ui://GtkLabel[@id='colorlabel'] orphan-label
svx/uiconfig/ui/sidebarline.ui://GtkLabel[@id='translabel'] orphan-label
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
index 464b9a1d43b2..531b09af43ac 100644
--- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
@@ -55,7 +55,7 @@ GraphicPropertyPanel::GraphicPropertyPanel(
get(mpMtrContrast, "setcontrast");
get(mpLBColorMode, "setcolormode");
mpLBColorMode->set_width_request(mpLBColorMode->get_preferred_size().Width());
- get(mpMtrTrans, "settransparency");
+ get(mpMtrTrans, "setgraphtransparency");
get(mpMtrRed, "setred");
get(mpMtrGreen, "setgreen");
get(mpMtrBlue, "setblue");
diff --git a/svx/uiconfig/ui/sidebargraphic.ui
b/svx/uiconfig/ui/sidebargraphic.ui
index e6991d512fe1..23ac5699e05f 100644
--- a/svx/uiconfig/ui/sidebargraphic.ui
+++ b/svx/uiconfig/ui/sidebargraphic.ui
@@ -149,7 +149,7 @@
<property name="can_focus">False</property>
<property name="label" translatable="yes"
context="sidebargraphic|transparencylabel">_Transparency:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">settransparency:%</property>
+ <property
name="mnemonic_widget">setgraphtransparency:%</property>
<property name="xalign">0</property>
</object>
<packing>
@@ -158,19 +158,19 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="settransparency:%">
+ <object class="GtkSpinButton" id="setgraphtransparency:%">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip_text" translatable="yes"
context="sidebargraphic|settransparency|tooltip_text">Specify the percentage of
transparency; 0% is fully opaque and 100% is fully transparent.</property>
+ <property name="tooltip_text" translatable="yes"
context="sidebargraphic|setgraphtransparency|tooltip_text">Specify the
percentage of transparency; 0% is fully opaque and 100% is fully
transparent.</property>
<property name="adjustment">0to100adjustment</property>
<property name="climb_rate">1</property>
<accessibility>
<relation type="labelled-by" target="transparencylabel"/>
</accessibility>
<child internal-child="accessible">
- <object class="AtkObject" id="settransparency:%-atkobject">
- <property name="AtkObject::accessible-name"
translatable="yes"
context="sidebargraphic|settransparency-atkobject">Transparency</property>
+ <object class="AtkObject"
id="setgraphtransparency:%-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes"
context="sidebargraphic|setgraphtransparency-atkobject">Transparency</property>
</object>
</child>
</object>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
