summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorTamás Zolnai <tamas.zolnai@collabora.com>2020-05-07 17:28:02 +0200
committerTamás Zolnai <tamas.zolnai@collabora.com>2020-05-08 23:03:35 +0200
commit59636f1bd42be310ff0cff12f6c55c6395fb2cf5 (patch)
tree93845c84a0dd1e9bb33141af2018b3ce0b61edbd /sw/source
parent77a544b63d2713b842049666e9be5cb30e9ce219 (diff)
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@collabora.com>
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/core/doc/docbm.cxx3
1 files changed, 2 insertions, 1 deletions
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);
}
}