summaryrefslogtreecommitdiff
path: root/sw/inc
diff options
context:
space:
mode:
authorJustin Luth <justin.luth@collabora.com>2022-11-28 11:20:06 -0500
committerMiklos Vajna <vmiklos@collabora.com>2022-11-30 08:35:50 +0100
commit79553e784c6d4587814bc2a577d7251c458df8d4 (patch)
tree2da3a5587166cc96e2cbc9365088e915c607ff88 /sw/inc
parent5e8f6dcb8ce00d2d5e35b3cf5654187b3068276c (diff)
tdf#151548 ContentControls: improve Invalidation
This addresses some hack concerns that Miklos raised in his review. Change-Id: Ic6d906e9eb1d23700fb743e179ba87899ce2f4a1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143412 Tested-by: Jenkins Reviewed-by: Justin Luth <jluth@mail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sw/inc')
-rw-r--r--sw/inc/formatcontentcontrol.hxx2
-rw-r--r--sw/inc/textcontentcontrol.hxx2
2 files changed, 3 insertions, 1 deletions
diff --git a/sw/inc/formatcontentcontrol.hxx b/sw/inc/formatcontentcontrol.hxx
index 415132409e10..88d32e83d31a 100644
--- a/sw/inc/formatcontentcontrol.hxx
+++ b/sw/inc/formatcontentcontrol.hxx
@@ -180,9 +180,11 @@ class SW_DLLPUBLIC SwContentControl : public sw::BroadcastingModify
sal_Int32 m_nId = 0;
/// Stores a list item index, in case the doc model is not yet updated.
+ // i.e. temporarily store the selected item until the text is inserted by GotoContentControl.
std::optional<size_t> m_oSelectedListItem;
/// Stores a date timestamp, in case the doc model is not yet updated.
+ // i.e. temporarily store the date until the text is inserted by GotoContentControl.
std::optional<double> m_oSelectedDate;
/**
diff --git a/sw/inc/textcontentcontrol.hxx b/sw/inc/textcontentcontrol.hxx
index 156b44804195..8c8a3b3ee044 100644
--- a/sw/inc/textcontentcontrol.hxx
+++ b/sw/inc/textcontentcontrol.hxx
@@ -42,7 +42,7 @@ public:
void ChgTextNode(SwTextNode* pNode);
SwTextNode* GetTextNode() const;
- void Invalidate(bool bKeepPlaceholderStatus = true);
+ void Invalidate();
void dumpAsXml(xmlTextWriterPtr pWriter) const override;
};