diff options
| author | Scott Clarke <scott.clarke@codethink.co.uk> | 2019-08-13 09:54:12 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-08-28 09:08:12 +0200 |
| commit | 24613559e1dc44f6ee8ed170d83b9ed518cff9a1 (patch) | |
| tree | 829cec30434ead05f5c0c55ea01a13a97df0d5ed /xmloff | |
| parent | 5ddf4f95d5c528365a292df64d6d0e8e4ac1906b (diff) | |
Change some handling for resolved comments
Changed the way the lcl_CommentNotification method is called when a
comment is resolved such that resolution is distinct from other changes.
Resolved flag is now only stored in the top annotation of a thread when
saved as ODT.
(cherry picked from commit 9751b4b4fa00cf5175ccc0f9c52a22b07f73d4aa)
Conflicts:
sw/source/uibase/docvw/PostItMgr.cxx
Change-Id: I5ef36718fd7e1dfcc16c077871653a70476e8804
Reviewed-on: https://gerrit.libreoffice.org/78187
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/text/txtflde.cxx | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx index 412e88663172..0057fa9c2128 100644 --- a/xmloff/source/text/txtflde.cxx +++ b/xmloff/source/text/txtflde.cxx @@ -1744,18 +1744,20 @@ void XMLTextFieldExport::ExportFieldHelper( OUString aName; rPropSet->getPropertyValue(gsPropertyName) >>= aName; if (!aName.isEmpty()) - GetExport().AddAttribute(XML_NAMESPACE_OFFICE, XML_NAME, aName); - SvtSaveOptions::ODFSaneDefaultVersion eVersion = rExport.getSaneDefaultVersion(); - if(eVersion > SvtSaveOptions::ODFSVER_012) { - bool b = GetBoolProperty("Resolved", rPropSet); - OUString aResolvedText; - OUStringBuffer aResolvedTextBuffer; - ::sax::Converter::convertBool(aResolvedTextBuffer, b); - aResolvedText = aResolvedTextBuffer.makeStringAndClear(); - - GetExport().AddAttribute(XML_NAMESPACE_LO_EXT, XML_RESOLVED, - aResolvedText); + GetExport().AddAttribute(XML_NAMESPACE_OFFICE, XML_NAME, aName); + SvtSaveOptions::ODFSaneDefaultVersion eVersion = rExport.getSaneDefaultVersion(); + if(eVersion > SvtSaveOptions::ODFSVER_012) + { + bool b = GetBoolProperty("Resolved", rPropSet); + OUString aResolvedText; + OUStringBuffer aResolvedTextBuffer; + ::sax::Converter::convertBool(aResolvedTextBuffer, b); + aResolvedText = aResolvedTextBuffer.makeStringAndClear(); + + GetExport().AddAttribute(XML_NAMESPACE_LO_EXT, XML_RESOLVED, + aResolvedText); + } } SvXMLElementExport aElem(GetExport(), XML_NAMESPACE_OFFICE, XML_ANNOTATION, false, true); |