summaryrefslogtreecommitdiff
path: root/sw/source/uibase/dbui
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-09-20 14:03:26 +0100
committerCaolán McNamara <caolanm@redhat.com>2021-09-20 20:47:39 +0200
commit45e8b85a50bf153b6c9f627e731eecee1cf966f2 (patch)
tree0a6fbbb3b39f79ea84727e49eb0837383a6e7575 /sw/source/uibase/dbui
parente1972743d692c8d8611912c31aae2cb08ae7636d (diff)
Resolves: tdf#144620 toolbar config item overwrites options dialog one
There are two SwMailMergeConfigItem involved. One SwMailMergeConfigItem from the toolbar created and considered modified and with changes not commited to the config yet. Then the other SwMailMergeConfigItem is created by the options dialog and commited on ok, but after that commit at cui/source/options/treeopt.cxx at line 723 there is a utl::ConfigManager::storeConfigItems() to flush all outstanding config items, so the one belonging to the toolbar is now flushed after the options dialog one was written. The SwMailMergeConfigItem has a IsModified() of true right after ctor which doesn't seem intentional, there is no explicit set of Modified to true on setting the simple bool members, the Modified bit is toggled on when using the more complicated modifier methods during ctor so very much looks like an accidental side effect. Change-Id: If84a6f01c7bf92704dd1e175a2bd8e2ea59e157f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122364 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/uibase/dbui')
-rw-r--r--sw/source/uibase/dbui/mmconfigitem.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx
index 26462bccf41a..744373edefc3 100644
--- a/sw/source/uibase/dbui/mmconfigitem.cxx
+++ b/sw/source/uibase/dbui/mmconfigitem.cxx
@@ -290,6 +290,7 @@ SwMailMergeConfigItem_Impl::SwMailMergeConfigItem_Impl() :
case 39: pValues[nProp] >>= m_nCurrentAddressBlock; break;
}
}
+ ClearModified();
}
//read the list of data base assignments
Sequence<OUString> aAssignments = GetNodeNames(cAddressDataAssignments);