summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2015-01-02 02:32:25 +0100
committerJan Holesovsky <kendy@collabora.com>2015-01-04 02:15:04 +0100
commit5f363ce8bc563f64271744026cf0e16830cf9b06 (patch)
tree33518d7f5fb100cab0cfbc2c4d72a801d8862e9b /include
parent39ac529d141dcd4de534eddbcc6c07bc49367b90 (diff)
changes sidebar: Use images instead of texts for types of changes in Writer.
This is a Writer-only change because: 1) Calc does not have the changes sidebar yet. 2) The redlines in Calc have more complex descriptions (like 'Deleted column'), so postponing that for now until I have a good list of the possible values there so that I can ask for the icons. Change-Id: I2d9860261d0b690012c3c11cdd97a140f48842bf
Diffstat (limited to 'include')
-rw-r--r--include/svx/ctredlin.hxx30
1 files changed, 22 insertions, 8 deletions
diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index 8d0f31915525..2eb1f17bc1ae 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -98,8 +98,9 @@ private:
DateTime aDaTiFilterFirst;
DateTime aDaTiFilterLast;
OUString aAuthor;
- Color aEntryColor;
- OUString aCurEntry;
+ Color maEntryColor;
+ Image maEntryImage;
+ OUString maEntryString;
utl::TextSearch* pCommentSearcher;
Link aColCompareLink;
@@ -136,19 +137,32 @@ public:
bool IsValidEntry(const OUString &rAuthor, const DateTime &rDateTime);
bool IsValidComment(const OUString &rComment);
- SvTreeListEntry* InsertEntry(const OUString& ,RedlinData *pUserData,
- SvTreeListEntry* pParent=NULL,sal_uIntPtr nPos=TREELIST_APPEND);
+ /** Insert a redline entry.
- SvTreeListEntry* InsertEntry(const OUString& ,RedlinData *pUserData,const Color&,
- SvTreeListEntry* pParent=NULL,sal_uIntPtr nPos=TREELIST_APPEND);
+ The rStr contains the entire redline entry; the columns are delimited by '\t'.
+ */
+ SvTreeListEntry* InsertEntry(const OUString &rStr, RedlinData *pUserData,
+ SvTreeListEntry* pParent = NULL, sal_uIntPtr nPos = TREELIST_APPEND);
+ /** Insert a redline entry.
+
+ The rStr contains the entire redline entry; the columns are delimited by '\t'.
+ */
+ SvTreeListEntry* InsertEntry(const OUString &rStr, RedlinData *pUserData, const Color&,
+ SvTreeListEntry* pParent = NULL, sal_uIntPtr nPos = TREELIST_APPEND);
+
+ /** Insert a redline entry.
+
+ rRedlineType contains the image for this redline entry (plus for insertion, minus for deletion etc.).
+ rStr contains the rest of the redline entry; the columns are delimited by '\t'.
+ */
+ SvTreeListEntry* InsertEntry(const Image &rRedlineType, const OUString &rStr, RedlinData *pUserData,
+ SvTreeListEntry* pParent = NULL, sal_uIntPtr nPos = TREELIST_APPEND);
virtual SvTreeListEntry* CreateEntry() const SAL_OVERRIDE;
void SetColCompareHdl(const Link& rLink ) { aColCompareLink = rLink; }
const Link& GetColCompareHdl() const { return aColCompareLink; }
-
-
};