From 64cb57c82d9e7f7069821b2e2ef92574ec73ebe2 Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Thu, 30 Aug 2018 12:23:33 +0300 Subject: 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 --- sw/inc/doc.hxx | 4 ++- sw/inc/ndtxt.hxx | 6 +++-- sw/qa/extras/mailmerge/data/tdf118845.fodt | 28 +++++++++++++++++++++ sw/qa/extras/mailmerge/mailmerge.cxx | 40 ++++++++++++++++++++++++++++++ sw/source/core/doc/doc.cxx | 18 ++++++++------ sw/source/core/text/txtfrm.cxx | 17 +++++++++---- sw/source/core/txtnode/thints.cxx | 24 ++++++++++++------ 7 files changed, 115 insertions(+), 22 deletions(-) create mode 100644 sw/qa/extras/mailmerge/data/tdf118845.fodt diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index ff1ba91a3f79..5094c35f7344 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -466,7 +466,9 @@ public: ::sw::DocumentFieldsManager & GetDocumentFieldsManager(); - bool FieldCanHidePara(SwFieldIds eFieldId) const; + // Returns 0 if the field cannot hide para, or a positive integer indicating the field type + // "weight" when several hiding fields' FieldHidesPara() give conflicting results + int FieldCanHideParaWeight(SwFieldIds eFieldId) const; bool FieldHidesPara(const SwField& rField) const; // IDocumentContentOperations 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); } diff --git a/sw/qa/extras/mailmerge/data/tdf118845.fodt b/sw/qa/extras/mailmerge/data/tdf118845.fodt new file mode 100644 index 000000000000..64a5180da718 --- /dev/null +++ b/sw/qa/extras/mailmerge/data/tdf118845.fodt @@ -0,0 +1,28 @@ + + + + + + 4_v01 + Tabelle1 + 0 + true + + + + + + + + + + + + + Dear Mrs. <Nachname>, + Dear Mr. <Nachname>, + To whom it may concern, + + + + \ No newline at end of file diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx b/sw/qa/extras/mailmerge/mailmerge.cxx index 5a647efff1c0..c1d78685ff24 100644 --- a/sw/qa/extras/mailmerge/mailmerge.cxx +++ b/sw/qa/extras/mailmerge/mailmerge.cxx @@ -860,5 +860,45 @@ DECLARE_FILE_MAILMERGE_TEST(testEmptyValuesNewFODT, "tdf35798-new.fodt", "5-with } } +DECLARE_SHELL_MAILMERGE_TEST(testTdf118845, "tdf118845.fodt", "4_v01.ods", "Tabelle1") +{ + executeMailMerge(); + + // Both male and female greetings were shown, thus each page had 3 paragraphs + + SwXTextDocument* pTextDoc = dynamic_cast(mxMMComponent.get()); + CPPUNIT_ASSERT(pTextDoc); + sal_uInt16 nPhysPages = pTextDoc->GetDocShell()->GetWrtShell()->GetPhyPageNum(); + CPPUNIT_ASSERT_EQUAL(sal_uInt16(7), nPhysPages); // 4 pages, each odd, and 3 blanks + + uno::Reference xTextDocument(mxMMComponent, uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(8, getParagraphs(xTextDocument->getText())); + + uno::Reference xParagraph(getParagraphOrTable(1, xTextDocument->getText()), + uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(OUString("Dear Mrs. Mustermann1,"), xParagraph->getString()); + + xParagraph.set(getParagraphOrTable(2, xTextDocument->getText()), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(OUString(""), xParagraph->getString()); + + xParagraph.set(getParagraphOrTable(3, xTextDocument->getText()), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(OUString("Dear Mr. Mustermann2,"), xParagraph->getString()); + + xParagraph.set(getParagraphOrTable(4, xTextDocument->getText()), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(OUString(""), xParagraph->getString()); + + xParagraph.set(getParagraphOrTable(5, xTextDocument->getText()), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(OUString("Dear Mrs. Mustermann3,"), xParagraph->getString()); + + xParagraph.set(getParagraphOrTable(6, xTextDocument->getText()), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(OUString(""), xParagraph->getString()); + + xParagraph.set(getParagraphOrTable(7, xTextDocument->getText()), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(OUString("Dear Mr. Mustermann4,"), xParagraph->getString()); + + xParagraph.set(getParagraphOrTable(8, xTextDocument->getText()), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(OUString(""), xParagraph->getString()); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx index c98ea37d955a..ed90bf3e2fcb 100644 --- a/sw/source/core/doc/doc.cxx +++ b/sw/source/core/doc/doc.cxx @@ -1358,17 +1358,20 @@ bool HandleHidingField(SwFormatField& rFormatField, const SwNodes& rNodes, } } -bool SwDoc::FieldCanHidePara(SwFieldIds eFieldId) const +// The greater the returned value, the more weight has this field type on deciding the final +// paragraph state +int SwDoc::FieldCanHideParaWeight(SwFieldIds eFieldId) const { switch (eFieldId) { case SwFieldIds::HiddenPara: - return true; + return 20; case SwFieldIds::Database: - return GetDocumentSettingManager().get( - DocumentSettingId::EMPTY_DB_FIELD_HIDES_PARA); + return GetDocumentSettingManager().get(DocumentSettingId::EMPTY_DB_FIELD_HIDES_PARA) + ? 10 + : 0; default: - return false; + return 0; } } @@ -1379,7 +1382,8 @@ bool SwDoc::FieldHidesPara(const SwField& rField) const case SwFieldIds::HiddenPara: return static_cast(rField).IsHidden(); case SwFieldIds::Database: - return FieldCanHidePara(SwFieldIds::Database) && rField.ExpandField(true).isEmpty(); + return FieldCanHideParaWeight(SwFieldIds::Database) + && rField.ExpandField(true).isEmpty(); default: return false; } @@ -1411,7 +1415,7 @@ bool SwDoc::RemoveInvisibleContent() std::vector> aHidingFieldTypes; for (SwFieldType* pType : *getIDocumentFieldsAccess().GetFieldTypes()) { - if (FieldCanHidePara(pType->Which())) + if (FieldCanHideParaWeight(pType->Which())) aHidingFieldTypes.push_back(o3tl::make_unique(pType)); } for (const auto& pTypeGuard : aHidingFieldTypes) diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx index 402474391a44..6d83d3285c97 100644 --- a/sw/source/core/text/txtfrm.cxx +++ b/sw/source/core/text/txtfrm.cxx @@ -1045,18 +1045,25 @@ bool SwTextFrame::IsHiddenNow() const } sw::MergedAttrIter iter(*this); SwTextNode const* pNode(nullptr); + int nNewResultWeight = 0; for (SwTextAttr const* pHint = iter.NextAttr(&pNode); pHint; pHint = iter.NextAttr(&pNode)) { if (pHint->Which() == RES_TXTATR_FIELD) { + // see also SwpHints::CalcHiddenParaField() const SwFormatField& rField = pHint->GetFormatField(); - if (pNode->FieldCanHidePara(rField.GetField()->GetTyp()->Which())) + int nCurWeight = pNode->FieldCanHideParaWeight(rField.GetField()->GetTyp()->Which()); + if (nCurWeight > nNewResultWeight) { + nNewResultWeight = nCurWeight; + bHiddenParaField = pNode->FieldHidesPara(*rField.GetField()); + } + else if (nCurWeight == nNewResultWeight && bHiddenParaField) + { + // Currently, for both supported hiding types (HiddenPara, Database), "Don't hide" + // takes precedence - i.e., if there's a "Don't hide" field of that weight, we only + // care about fields of higher weight. bHiddenParaField = pNode->FieldHidesPara(*rField.GetField()); - if (!bHiddenParaField) - { - break; // not hidden, see CalcHiddenParaField() - } } } } diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx index 3e2049cf2337..cf6cade9344e 100644 --- a/sw/source/core/txtnode/thints.cxx +++ b/sw/source/core/txtnode/thints.cxx @@ -1156,7 +1156,7 @@ void SwTextNode::DestroyAttr( SwTextAttr* pAttr ) // certain fields must update the SwDoc's calculation flags // Certain fields (like HiddenParaField) must trigger recalculation of visible flag - if (FieldCanHidePara(pFieldType->Which())) + if (FieldCanHideParaWeight(pFieldType->Which())) SetCalcHiddenParaField(); switch( pFieldType->Which() ) @@ -1466,7 +1466,8 @@ bool SwTextNode::InsertHint( SwTextAttr * const pAttr, const SetAttrMode nMode ) case RES_TXTATR_FIELD: { // trigger notification for relevant fields, like HiddenParaFields - if (FieldCanHidePara(pAttr->GetFormatField().GetField()->GetTyp()->Which())) + if (FieldCanHideParaWeight( + pAttr->GetFormatField().GetField()->GetTyp()->Which())) { bHiddenPara = true; } @@ -2591,6 +2592,7 @@ bool SwpHints::CalcHiddenParaField() const m_bCalcHiddenParaField = false; const bool bOldHiddenByParaField = m_bHiddenByParaField; bool bNewHiddenByParaField = false; + int nNewResultWeight = 0; const size_t nSize = Count(); const SwTextAttr* pTextHt; @@ -2601,12 +2603,20 @@ bool SwpHints::CalcHiddenParaField() const if (RES_TXTATR_FIELD == nWhich) { + // see also SwTextFrame::IsHiddenNow() const SwFormatField& rField = pTextHt->GetFormatField(); - if (m_rParent.FieldCanHidePara(rField.GetField()->GetTyp()->Which()) - && !(bNewHiddenByParaField = m_rParent.FieldHidesPara(*rField.GetField()))) + int nCurWeight = m_rParent.FieldCanHideParaWeight(rField.GetField()->GetTyp()->Which()); + if (nCurWeight > nNewResultWeight) { - // If there's at least one field telling not to hide, so be it - break; + nNewResultWeight = nCurWeight; + bNewHiddenByParaField = m_rParent.FieldHidesPara(*rField.GetField()); + } + else if (nCurWeight == nNewResultWeight && bNewHiddenByParaField) + { + // Currently, for both supported hiding types (HiddenPara, Database), "Don't hide" + // takes precedence - i.e., if there's a "Don't hide" field of that weight, we only + // care about fields of higher weight. + bNewHiddenByParaField = m_rParent.FieldHidesPara(*rField.GetField()); } } } @@ -3288,7 +3298,7 @@ void SwpHints::DeleteAtPos( const size_t nPos ) pTextField->ChgTextNode(nullptr); } else if (m_bHiddenByParaField - && m_rParent.FieldCanHidePara(pFieldTyp->Which())) + && m_rParent.FieldCanHideParaWeight(pFieldTyp->Which())) { m_bCalcHiddenParaField = true; } -- cgit v1.2.3