[Libreoffice-commits] core.git: sw/source sw/uiconfig

[Zdeněk Crhonek]

 sw/source/ui/fldui/fldfunc.cxx        |    2 +-
 sw/uiconfig/swriter/ui/fldfuncpage.ui |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 2701104d1a08da465daa37ab3bb74e05d2f563c3
Author: Zdeněk Crhonek <zcrhonek at gmail.com>
Date:   Tue Feb 6 16:07:40 2018 +0100

    rename non-unique id for better UI testing
    
    Change-Id: Id271001411ae34269451008ca54ab5855aae7da5
    Reviewed-on: https://gerrit.libreoffice.org/49305
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index 6842d030d471..5a7b794aad84 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -48,7 +48,7 @@ SwFieldFuncPage::SwFieldFuncPage(vcl::Window* pParent, const SfxItemSet *const p
     get(m_pSelectionLB, "select");
     get(m_pFormatLB, "format");
     get(m_pNameFT, "nameft");
-    get(m_pNameED, "name");
+    get(m_pNameED, "condFunction");
     get(m_pValueGroup, "valuegroup");
     get(m_pValueFT, "valueft");
     get(m_pValueED, "value");
diff --git a/sw/uiconfig/swriter/ui/fldfuncpage.ui b/sw/uiconfig/swriter/ui/fldfuncpage.ui
index 3891217eff2b..557b356b8652 100644
--- a/sw/uiconfig/swriter/ui/fldfuncpage.ui
+++ b/sw/uiconfig/swriter/ui/fldfuncpage.ui
@@ -225,7 +225,7 @@
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes" context="fldfuncpage|nameft">Na_me</property>
                 <property name="use_underline">True</property>
-                <property name="mnemonic_widget">name</property>
+                <property name="mnemonic_widget">condFunction</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -235,7 +235,7 @@
               </packing>
             </child>
             <child>
-              <object class="swlo-ConditionEdit" id="name">
+              <object class="swlo-ConditionEdit" id="condFunction">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="invisible_char">•</property>