diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-11-08 18:51:20 +0100 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-11-14 18:42:15 +0100 |
| commit | e7f028d440406757e661d12ba7cff2506d82d209 (patch) | |
| tree | 34555d94430cf70a0f29605ce94ed21bfd14103a | |
| parent | d6f19940c07f06937c1517900e73c6bdd118533e (diff) | |
sw_redlinehide_3: expand layout-dependent in SwChapterField/SwGetRefField
Change-Id: I3b68a46f68fb4070d26b247a6701b510cc209d9b
| -rw-r--r-- | sw/source/core/fields/chpfld.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/fields/reffld.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/fields/chpfld.cxx b/sw/source/core/fields/chpfld.cxx index 957930f18af4..31dd91c4d50b 100644 --- a/sw/source/core/fields/chpfld.cxx +++ b/sw/source/core/fields/chpfld.cxx @@ -95,9 +95,9 @@ const OUString& SwChapterField::GetTitle(SwRootFrame const*const pLayout) const return rState.sTitle; } -OUString SwChapterField::ExpandImpl(SwRootFrame const*const) const +OUString SwChapterField::ExpandImpl(SwRootFrame const*const pLayout) const { - State const& rState(m_State); + State const& rState(pLayout && pLayout->IsHideRedlines() ? m_StateRLHidden : m_State); switch( GetFormat() ) { case CF_TITLE: diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx index 127ea5964155..fc83fabbe343 100644 --- a/sw/source/core/fields/reffld.cxx +++ b/sw/source/core/fields/reffld.cxx @@ -416,9 +416,9 @@ void SwGetRefField::SetExpand( const OUString& rStr ) m_sTextRLHidden = rStr; } -OUString SwGetRefField::ExpandImpl(SwRootFrame const*const) const +OUString SwGetRefField::ExpandImpl(SwRootFrame const*const pLayout) const { - return m_sText; + return pLayout && pLayout->IsHideRedlines() ? m_sTextRLHidden : m_sText; } OUString SwGetRefField::GetFieldName() const |