[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - svx/source svx/uiconfig

[Szymon KÅ‚os (via logerrit)]

 svx/source/sidebar/effect/EffectPropertyPanel.cxx |    2 +-
 svx/uiconfig/ui/sidebareffect.ui                  |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 00d52f5119b091f51fee188655a1bfc4c84889f8
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Fri Jul 9 16:38:57 2021 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Fri Jul 9 17:55:27 2021 +0200

    jsdialog: dont use popular id for glow color
    
    to avoid confusing it on updates
    
    Change-Id: I2b19dc41a17e070ac1c8869d478c3b0b09a54223
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118692
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/svx/source/sidebar/effect/EffectPropertyPanel.cxx b/svx/source/sidebar/effect/EffectPropertyPanel.cxx
index 44b825aa77f4..af65ce5efce2 100644
--- a/svx/source/sidebar/effect/EffectPropertyPanel.cxx
+++ b/svx/source/sidebar/effect/EffectPropertyPanel.cxx
@@ -37,7 +37,7 @@ EffectPropertyPanel::EffectPropertyPanel(weld::Widget* pParent, SfxBindings* pBi
           m_xBuilder->weld_metric_spin_button("LB_GLOW_TRANSPARENCY", FieldUnit::PERCENT))
     , mxFTRadiusSoftEdge(m_xBuilder->weld_label("radiussoftedge"))
     , mxFTRadiusGlow(m_xBuilder->weld_label("radiusglow"))
-    , mxFTColor(m_xBuilder->weld_label("color"))
+    , mxFTColor(m_xBuilder->weld_label("glowcolorlabel"))
     , mxSoftEdgeRadius(m_xBuilder->weld_metric_spin_button("SB_SOFTEDGE_RADIUS", FieldUnit::POINT))
 {
     Initialize();
diff --git a/svx/uiconfig/ui/sidebareffect.ui b/svx/uiconfig/ui/sidebareffect.ui
index 0e633242cd5c..23997adee33e 100644
--- a/svx/uiconfig/ui/sidebareffect.ui
+++ b/svx/uiconfig/ui/sidebareffect.ui
@@ -77,7 +77,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="color">
+                          <object class="GtkLabel" id="glowcolorlabel">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="label" translatable="yes" context="sidebarglow|color">Color:</property>
@@ -239,7 +239,7 @@
   <object class="GtkSizeGroup" id="sizegroupLabel">
     <widgets>
       <widget name="radiusglow"/>
-      <widget name="color"/>
+      <widget name="glowcolorlabel"/>
       <widget name="transparency"/>
       <widget name="radiussoftedge"/>
     </widgets>