summaryrefslogtreecommitdiff
path: root/sw/inc
diff options
context:
space:
mode:
authorScott Clarke <scott.clarke@codethink.co.uk>2019-08-13 09:54:12 +0100
committerMiklos Vajna <vmiklos@collabora.com>2019-08-28 09:08:12 +0200
commit24613559e1dc44f6ee8ed170d83b9ed518cff9a1 (patch)
tree829cec30434ead05f5c0c55ea01a13a97df0d5ed /sw/inc
parent5ddf4f95d5c528365a292df64d6d0e8e4ac1906b (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 'sw/inc')
-rw-r--r--sw/inc/fmtfld.hxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx
index 6c1b805e952c..076eaa53d4da 100644
--- a/sw/inc/fmtfld.hxx
+++ b/sw/inc/fmtfld.hxx
@@ -114,7 +114,8 @@ enum class SwFormatFieldHintWhich
REMOVED = 2,
FOCUS = 3,
CHANGED = 4,
- LANGUAGE = 5
+ LANGUAGE = 5,
+ RESOLVED = 6
};
class SW_DLLPUBLIC SwFormatFieldHint : public SfxHint