diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-08-30 12:23:33 +0300 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-08-31 13:05:24 +0200 |
| commit | 64cb57c82d9e7f7069821b2e2ef92574ec73ebe2 (patch) | |
| tree | a7eb664552a45c2786be2dfb40caa7ef8736c4f2 /sw/inc/ndtxt.hxx | |
| parent | eb199c1b5e8d6039a1969cc6ddb3d627bedf5bd8 (diff) | |
tdf#118845: make HiddenPara have higher priority deciding visibility
Otherwise, a Database field in a paragraph which is non-empty would
force the paragraph to be visible, regardless of HiddenPara field
telling it to be hidden.
Regression from commit db04be037b611e296ef9f2542322c52ed82d7a2b
Change-Id: I21807e22bd339fd1ea0aaa3b382579f688903418
Reviewed-on: https://gerrit.libreoffice.org/59792
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Diffstat (limited to 'sw/inc/ndtxt.hxx')
| -rw-r--r-- | sw/inc/ndtxt.hxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx index a4f0bd55e9a3..c9e1f2b334ae 100644 --- a/sw/inc/ndtxt.hxx +++ b/sw/inc/ndtxt.hxx @@ -708,8 +708,10 @@ public: bool IsHiddenByParaField() const { return m_pSwpHints && m_pSwpHints->IsHiddenByParaField(); } - bool FieldCanHidePara(SwFieldIds eFieldId) const - { return GetDoc()->FieldCanHidePara(eFieldId); } + int FieldCanHideParaWeight(SwFieldIds eFieldId) const + { + return GetDoc()->FieldCanHideParaWeight(eFieldId); + } bool FieldHidesPara(const SwField& rField) const { return GetDoc()->FieldHidesPara(rField); } |