summaryrefslogtreecommitdiffstats
path: root/comphelper/source/property/MasterPropertySet.cxx
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2014-07-13 18:02:29 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-07-13 18:34:36 +0200
commitd0a7a60cfa1a34ec7218656489b7463cd9eb1aad (patch)
tree9136aa054c6870af62bece05dbb06684aadaf385 /comphelper/source/property/MasterPropertySet.cxx
parentfix merge peculiarities (diff)
downloadcore-d0a7a60cfa1a34ec7218656489b7463cd9eb1aad.tar.gz
core-d0a7a60cfa1a34ec7218656489b7463cd9eb1aad.zip
fdo#80905 SwXTextFieldMasters::hasByName(): sync with SwXFieldMaster
Normally a mail merge field has a name like "css.text.fieldmaster.DataBase.<datasource name>.<table name>.<column name>", however this isn't enforced: just "css.text.fieldmaster.DataBase.TEST" is also accepted (even if its semantics are ~undefined). If SwXFieldMaster::setPropertyValue() allows setting such a field master name, then SwXTextFieldMasters::hasByName() should not ignore such field masters that have no dot in their name ("TEST") or use "Database", not "DataBase", otherwise (sane) client code in writerfilter ends up with hasByName() returning false, but setPropertyValue() throwing an exception, because the field master does have such a name. This fixes DOCX/RTF import of multiple mail merge fields with the same field command. Change-Id: I498eabace25f8e466b3504ba13fa3060d4ba22da
Diffstat (limited to 'comphelper/source/property/MasterPropertySet.cxx')
0 files changed, 0 insertions, 0 deletions