From f32ddd38ef777598901981491ad57bd37efe69e8 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Mon, 15 Apr 2019 17:11:51 +0200 Subject: tdf#123855 sw_redlinehide: fix GetExpandText() not expanding footnotes ... due to change of default argument; the XHTML export is calling it from SwXTextPortion::getString(). This is complicated a bit by a bunch of changes to GetExpandText() callers. (regression from bf488abbf46da51d17c3ad7ccf9e39005a55c2d7) Change-Id: I0b1e10e17c8f3824d6fa1f21fc74cc59b310474f Reviewed-on: https://gerrit.libreoffice.org/70791 Tested-by: Jenkins Reviewed-by: Michael Stahl --- 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 3900f398adbd..b8efd5b985af 100644 --- a/sw/inc/ndtxt.hxx +++ b/sw/inc/ndtxt.hxx @@ -28,6 +28,7 @@ #include "ndhints.hxx" #include "SwNumberTreeTypes.hxx" #include "IDocumentContentOperations.hxx" +#include "modeltoviewhelper.hxx" #include @@ -680,7 +681,7 @@ public: const bool bWithNum = false, const bool bAddSpaceAfterListLabelStr = false, const bool bWithSpacesForLevel = false, - const ExpandMode eAdditionalMode = ExpandMode(0)) const; + const ExpandMode eAdditionalMode = ExpandMode::ExpandFootnote) const; bool CopyExpandText( SwTextNode& rDestNd, const SwIndex* pDestIdx, sal_Int32 nIdx, sal_Int32 nLen, SwRootFrame const* pLayout, -- cgit