summaryrefslogtreecommitdiff
path: root/sw/inc
diff options
context:
space:
mode:
authorLászló Németh <nemeth@numbertext.org>2022-03-16 14:29:34 +0100
committerLászló Németh <nemeth@numbertext.org>2022-03-16 16:09:47 +0100
commit3a14b2040ecd95a23acbc3e8d0f8087505135f11 (patch)
tree5719237a2487aa3d7242e08864b9e377e514e74b /sw/inc
parent0c50141cfc475768debb77127bc8ebb173b4a30f (diff)
tdf#148032 sw: add redline comment for tracked comments
Tracked insertion/deletion of comments were shown as plain text insertion/deletion in that case, too, when there is no other text change in the redline (only the invisible placeholder character CH_TXTATR_INWORD of the comment). This was fixed by the new action icons of the Manage Changes dialog window before, but for better accessibility, now redline of a newly inserted/deleted comment gets also a redline comment "Comment added"/"Comment deleted", shown in Manage Changes dialog window with the Comment added/Comment deleted action icons, as suggested by Heiko Tietze. Note: because the redline comment (at least the tracked insertions) are stored in the document, this is a back-compatible solution. Follow-up to commit 128d3b454467e34538903b2eab45e866f976b314 "tdf#73125 sw: add Insert/Delete Comment Manage Changes action icons". Change-Id: I7a9e82ae1b9519e4883956f69de0aafc289f7f99 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131659 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'sw/inc')
-rw-r--r--sw/inc/redline.hxx3
-rw-r--r--sw/inc/strings.hrc2
2 files changed, 5 insertions, 0 deletions
diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx
index 5e01cfa8349f..37c7e536d52c 100644
--- a/sw/inc/redline.hxx
+++ b/sw/inc/redline.hxx
@@ -208,6 +208,9 @@ public:
OUString const & GetAuthorString( sal_uInt16 nPos = 0 ) const;
const DateTime& GetTimeStamp( sal_uInt16 nPos = 0) const;
RedlineType GetType( sal_uInt16 nPos = 0 ) const;
+ // text content of the redline is only an annotation placeholder
+ // (i.e. a comment, but don't confuse it with comment of the redline)
+ bool IsAnnotation() const;
const OUString& GetComment( sal_uInt16 nPos = 0 ) const;
void SetComment( const OUString& rS ) { m_pRedlineData->SetComment( rS ); }
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index afcbbb86335e..b9a5cd8b6d82 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -1280,6 +1280,8 @@
#define STR_REDLINE_FORMATTED NC_("STR_REDLINE_FORMATTED", "Formats")
#define STR_REDLINE_TABLECHG NC_("STR_REDLINE_TABLECHG", "Table Changes")
#define STR_REDLINE_FMTCOLLSET NC_("STR_REDLINE_FMTCOLLSET", "Applied Paragraph Styles")
+#define STR_REDLINE_COMMENT_ADDED NC_("STR_REDLINE_COMMENT_ADDED", "Comment added")
+#define STR_REDLINE_COMMENT_DELETED NC_("STR_REDLINE_COMMENT_DELETED", "Comment deleted")
#define STR_PAGE NC_("STR_PAGE", "Page ")
#define STR_PAGE_COUNT NC_("STR_PAGE_COUNT", "Page %1 of %2")
#define STR_PAGE_COUNT_CUSTOM NC_("STR_PAGE_COUNT_CUSTOM", "Page %1 of %2 (Page %3)")