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

[Tamás Zolnai (via logerrit)]

 sw/source/core/doc/docbm.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 59636f1bd42be310ff0cff12f6c55c6395fb2cf5
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Thu May 7 17:28:02 2020 +0200
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Fri May 8 23:03:35 2020 +0200

    lok: MSForms: fix field activation for multiple fields.
    
    First hide hide the button of the previously active field
    and show the new button afterwards.
    
    Change-Id: I6de668f25a18f8c1d3dbf66beb357f089b51ae0b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93664
    Tested-by: Jenkins
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 2f7e48ce02f3..e59e285d9334 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -1481,7 +1481,6 @@ namespace sw::mark
             if (m_pLastActiveFieldmark != pFieldBM)
             {
                 FieldmarkWithDropDownButton& rFormField = dynamic_cast<FieldmarkWithDropDownButton&>(*pFieldBM);
-                rFormField.ShowButton(&rEditWin);
                 pNewActiveFieldmark = &rFormField;
             }
             else
@@ -1494,6 +1493,8 @@ namespace sw::mark
         {
             ClearFieldActivation();
             m_pLastActiveFieldmark = pNewActiveFieldmark;
+            if(pNewActiveFieldmark)
+                pNewActiveFieldmark->ShowButton(&rEditWin);
         }
     }