From eb3481d9d0d67c88e04a9da86e0cee6a7585c386 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 16 Nov 2018 18:52:32 +0100 Subject: sw_redlinehide_4a: add layout to SwTextNode::GetParaAttr() Merge items from first-node and props-node, as they are used in the text formatting. Change-Id: I4cbab55bc3b0f8bc6dc5bd3577da53b3160018a3 --- sw/inc/ndtxt.hxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sw/inc/ndtxt.hxx') diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx index 0818fde96434..64eef11f9221 100644 --- a/sw/inc/ndtxt.hxx +++ b/sw/inc/ndtxt.hxx @@ -305,7 +305,8 @@ public: bool GetParaAttr( SfxItemSet& rSet, sal_Int32 nStt, sal_Int32 nEnd, const bool bOnlyTextAttr = false, const bool bGetFromChrFormat = true, - const bool bMergeIndentValuesOfNumRule = false ) const; + const bool bMergeIndentValuesOfNumRule = false, + SwRootFrame const* pLayout = nullptr) const; /// Convey attributes of an AttrSet (AutoFormat) to SwpHintsArray. void FormatToTextAttr( SwTextNode* pNd ); -- cgit